Small fixes for better Clibgnomekbd-2-28

3 files changed, 36 insertions, 49 deletions

diff --git a/libgnomekbd/gkbd-indicator-plugin-manager.c b/libgnomekbd/gkbd-indicator-plugin-manager.c
index b6c2082..59a29a3 100644
--- a/libgnomekbd/gkbd-indicator-plugin-manager.c
+++ b/libgnomekbd/gkbd-indicator-plugin-manager.c
@@ -47,6 +47,8 @@ gkbd_indicator_plugin_manager_add_plugins_dir (GkbdIndicatorPluginManager *
 {
 	GDir *dir = g_dir_open (dirname, 0, NULL);
 	const gchar *filename;
+	const GkbdIndicatorPlugin *plugin;
+
 	if (dir == NULL)
 		return;
 
@@ -63,7 +65,7 @@ gkbd_indicator_plugin_manager_add_plugins_dir (GkbdIndicatorPluginManager *
 				if (g_module_symbol
 				    (module, "GetPlugin",
 				     &get_plugin_func)) {
-					const GkbdIndicatorPlugin *plugin =
+					plugin =
 					    ((GkbdIndicatorPluginGetPluginFunc)
 					     get_plugin_func) ();
 					if (plugin != NULL) {
@@ -76,14 +78,12 @@ gkbd_indicator_plugin_manager_add_plugins_dir (GkbdIndicatorPluginManager *
 							   "Loaded plugin from [%s]: [%s]/[%s]...\n",
 							   full_path,
 							   plugin->name,
-							   plugin->
-							   description);
+							   plugin->description);
 						rec->full_path = full_path;
 						rec->module = module;
 						rec->plugin = plugin;
 						g_hash_table_insert
-						    (manager->
-						     all_plugin_recs,
+						    (manager->all_plugin_recs,
 						     full_path, rec);
 						continue;
 					}
@@ -187,9 +187,8 @@ void
 					initialized = TRUE;
 
 				manager->inited_plugin_recs =
-				    g_slist_append (manager->
-						    inited_plugin_recs,
-						    rec);
+				    g_slist_append
+				    (manager->inited_plugin_recs, rec);
 				xkl_debug (100,
 					   "Plugin [%s] initialized: %d\n",
 					   plugin->name, initialized);
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index 49fe24e..04ed42e 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -998,8 +998,8 @@ draw_key (GkbdKeyboardDrawingRenderContext * context,
 
 	if (key->pressed)
 		color =
-		    &(GTK_WIDGET (drawing)->style->
-		      base[GTK_STATE_SELECTED]);
+		    &(GTK_WIDGET (drawing)->
+		      style->base[GTK_STATE_SELECTED]);
 	else
 		color = drawing->colors + key->xkbkey->color_ndx;
 
@@ -1097,9 +1097,8 @@ invalidate_indicator_doodad_region (GkbdKeyboardDrawing * drawing,
 			   doodad->doodad->indicator.left,
 			   doodad->origin_y +
 			   doodad->doodad->indicator.top,
-			   &drawing->xkb->geom->shapes[doodad->doodad->
-						       indicator.
-						       shape_ndx]);
+			   &drawing->xkb->geom->shapes[doodad->
+						       doodad->indicator.shape_ndx]);
 }
 
 static void
@@ -1113,8 +1112,8 @@ invalidate_key_region (GkbdKeyboardDrawing * drawing,
 			   key->angle,
 			   key->origin_x,
 			   key->origin_y,
-			   &drawing->xkb->geom->shapes[key->xkbkey->
-						       shape_ndx]);
+			   &drawing->xkb->geom->shapes[key->
+						       xkbkey->shape_ndx]);
 }
 
 static void
@@ -1350,8 +1349,8 @@ alloc_render_context (GkbdKeyboardDrawing * drawing)
 	pango_layout_set_ellipsize (context->layout, PANGO_ELLIPSIZE_END);
 
 	context->font_desc =
-	    pango_font_description_copy (GTK_WIDGET (drawing)->style->
-					 font_desc);
+	    pango_font_description_copy (GTK_WIDGET (drawing)->
+					 style->font_desc);
 	context->angle = 0;
 	context->scale_numerator = 1;
 	context->scale_denominator = 1;
@@ -1666,8 +1665,8 @@ init_keys_and_doodads (GkbdKeyboardDrawing * drawing)
 				    drawing->xkb->geom->shapes +
 				    xkbkey->shape_ndx;
 				guint keycode = find_keycode (drawing,
-							      xkbkey->name.
-							      name);
+							      xkbkey->
+							      name.name);
 
 				if (keycode == INVALID_KEYCODE)
 					continue;
@@ -1778,8 +1777,9 @@ init_colors (GkbdKeyboardDrawing * drawing)
 
 	for (i = 0; i < drawing->xkb->geom->num_colors; i++) {
 		result =
-		    parse_xkb_color_spec (drawing->xkb->geom->colors[i].
-					  spec, drawing->colors + i);
+		    parse_xkb_color_spec (drawing->xkb->geom->
+					  colors[i].spec,
+					  drawing->colors + i);
 
 		if (!result)
 			g_warning
@@ -1878,8 +1878,8 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 
 				for (i = 0;
 				     i <=
-				     drawing->xkb->indicators->
-				     phys_indicators; i++)
+				     drawing->xkb->
+				     indicators->phys_indicators; i++)
 					if (drawing->physical_indicators[i]
 					    != NULL
 					    && (iev->changed & 1 << i)) {
@@ -1889,33 +1889,27 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 
 						if ((state
 						     &&
-						     !drawing->
-						     physical_indicators
+						     !drawing->physical_indicators
 						     [i]->on) || (!state
 								  &&
-								  drawing->
-								  physical_indicators
-								  [i]->
-								  on)) {
-							drawing->
-							    physical_indicators
+								  drawing->physical_indicators
+								  [i]->on))
+						{
+							drawing->physical_indicators
 							    [i]->on =
 							    state;
 							create_cairo
 							    (drawing);
 							draw_doodad
-							    (drawing->
-							     renderContext,
+							    (drawing->renderContext,
 							     drawing,
-							     drawing->
-							     physical_indicators
+							     drawing->physical_indicators
 							     [i]);
 							destroy_cairo
 							    (drawing);
 							invalidate_indicator_doodad_region
 							    (drawing,
-							     drawing->
-							     physical_indicators
+							     drawing->physical_indicators
 							     [i]);
 						}
 					}
@@ -1977,7 +1971,7 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing)
 
 	drawing->display =
 	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-	printf ("dpy: %p\n", drawing->display);
+	printf ("dpy: %p\n", (void *) drawing->display);
 
 	if (!XkbQueryExtension
 	    (drawing->display, &opcode, &drawing->xkb_event_type, &error,
@@ -2156,15 +2150,9 @@ gkbd_keyboard_drawing_get_pixbuf (GkbdKeyboardDrawing * drawing)
 	return gdk_pixbuf_get_from_drawable (NULL, drawing->pixmap, NULL,
 					     0, 0, 0, 0,
 					     xkb_to_pixmap_coord (context,
-								  drawing->
-								  xkb->
-								  geom->
-								  width_mm),
+								  drawing->xkb->geom->width_mm),
 					     xkb_to_pixmap_coord (context,
-								  drawing->
-								  xkb->
-								  geom->
-								  height_mm));
+								  drawing->xkb->geom->height_mm));
 }
 
 /**
@@ -2195,8 +2183,8 @@ gkbd_keyboard_drawing_render (GkbdKeyboardDrawing * drawing,
 		cr,
 		drawing->renderContext->angle,
 		layout,
-		pango_font_description_copy (GTK_WIDGET (drawing)->style->
-					     font_desc),
+		pango_font_description_copy (GTK_WIDGET (drawing)->
+					     style->font_desc),
 		1, 1,
 		&GTK_WIDGET (drawing)->style->dark[GTK_WIDGET_STATE
 						   (GTK_WIDGET (drawing))]
diff --git a/libgnomekbd/gkbd-keyboard-drawing.h b/libgnomekbd/gkbd-keyboard-drawing.h
index c51a7f6..3d023e1 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.h
+++ b/libgnomekbd/gkbd-keyboard-drawing.h
@@ -57,7 +57,7 @@ typedef enum {
 	GKBD_KEYBOARD_DRAWING_POS_FIRST =
 	    GKBD_KEYBOARD_DRAWING_POS_TOPLEFT,
 	GKBD_KEYBOARD_DRAWING_POS_LAST =
-	    GKBD_KEYBOARD_DRAWING_POS_BOTTOMRIGHT,
+	    GKBD_KEYBOARD_DRAWING_POS_BOTTOMRIGHT
 } GkbdKeyboardDrawingGroupLevelPosition;
 
 /* units are in xkb form */