ansifying, indenting

svn path=/trunk/; revision=276

7 files changed, 30 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 163acfb..f80008a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 	* libgnomekbd/gkbd-util.c: make default size dependent on the screen
 	size (75%). Closing http://bugzilla.gnome.org/show_bug.cgi?id=481118
+	* libgnomekbd/gkbd-keyboard-drawing.c,
+	libgnomekbd/gkbd-keyboard-config.c, libgnomekbd/gkbd-desktop-config.c,
+	libgnomekbd/gkbd-indicator-plugin.h,
+	libgnomekbd/gkbd-indicator-config.c,
+	libgnomekbd/gkbd-indicator-plugin-manager.h: ansifying, indenting
+
 
 2008-04-13 svu
 
diff --git a/libgnomekbd/gkbd-desktop-config.c b/libgnomekbd/gkbd-desktop-config.c
index 3fac8d3..dd96e80 100644
--- a/libgnomekbd/gkbd-desktop-config.c
+++ b/libgnomekbd/gkbd-desktop-config.c
@@ -382,4 +382,3 @@ gkbd_desktop_config_load_group_descriptions (GkbdDesktopConfig
 
 	return True;
 }
-
diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c
index 8f784ec..faf1c81 100644
--- a/libgnomekbd/gkbd-indicator-config.c
+++ b/libgnomekbd/gkbd-indicator-config.c
@@ -109,13 +109,13 @@ gkbd_indicator_config_get_images_file (GkbdIndicatorConfig *
 			gkbd_keyboard_config_split_items (full_layout_name,
 							  &l, &v);
 			if (l != NULL) {
-				// probably there is something in theme?
+				/* probably there is something in theme? */
 				icon_info = gtk_icon_theme_lookup_icon
 				    (ind_config->icon_theme, l, 48, 0);
 			}
 		}
 	}
-	// fallback to the default value
+	/* fallback to the default value */
 	if (icon_info == NULL) {
 		icon_info = gtk_icon_theme_lookup_icon
 		    (ind_config->icon_theme, "stock_dialog-error", 48, 0);
diff --git a/libgnomekbd/gkbd-indicator-plugin-manager.h b/libgnomekbd/gkbd-indicator-plugin-manager.h
index 8a3c544..5a457bd 100644
--- a/libgnomekbd/gkbd-indicator-plugin-manager.h
+++ b/libgnomekbd/gkbd-indicator-plugin-manager.h
@@ -88,7 +88,7 @@ extern void
 						 const char *full_path,
 						 GtkWindow * parent);
 
-// actual calling plugin notification methods
+/* actual calling plugin notification methods */
 
 extern void
  gkbd_indicator_plugin_manager_group_changed (GkbdIndicatorPluginManager * manager,
diff --git a/libgnomekbd/gkbd-indicator-plugin.h b/libgnomekbd/gkbd-indicator-plugin.h
index 839fb21..7bce9aa 100644
--- a/libgnomekbd/gkbd-indicator-plugin.h
+++ b/libgnomekbd/gkbd-indicator-plugin.h
@@ -73,29 +73,29 @@ typedef struct _GkbdIndicatorPlugin {
 
 	const char *description;
 
-// implemented
+/* implemented */
 	GkbdIndicatorPluginInitFunc init_callback;
 
-// implemented
+/* implemented */
 	GkbdIndicatorPluginTermFunc term_callback;
 
-// implemented
+/* implemented */
 	 GkbdIndicatorPluginConfigureProperties
 	    configure_properties_callback;
 
-// implemented
+/* implemented */
 	GkbdIndicatorPluginGroupChangedFunc group_changed_callback;
 
-// implemented
+/* implemented */
 	GkbdIndicatorPluginWindowCreatedFunc window_created_callback;
 
-// implemented
+/* implemented */
 	GkbdIndicatorPluginDecorateWidget decorate_widget_callback;
 
-// non implemented
+/* not implemented */
 	GkbdIndicatorPluginConfigChangedFunc config_changed_callback;
 
-// non implemented
+/* not implemented */
 	GkbdIndicatorPluginCreateWidget create_widget_callback;
 
 } GkbdIndicatorPlugin;
diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
index 6fb34d6..0056ebd 100644
--- a/libgnomekbd/gkbd-keyboard-config.c
+++ b/libgnomekbd/gkbd-keyboard-config.c
@@ -746,8 +746,10 @@ gkbd_keyboard_config_to_string (const GkbdKeyboardConfig * config)
 
 		/* Translators: The count is related to the number of options. The %s
 		 * format specifier should not be modified, left "as is". */
-		layouts = g_strdup_printf (ngettext ("layout \"%s\"", "layouts \"%s\"",
-					count), buffer->str);
+		layouts =
+		    g_strdup_printf (ngettext
+				     ("layout \"%s\"", "layouts \"%s\"",
+				      count), buffer->str);
 		g_string_truncate (buffer, 0);
 	}
 	if (config->options) {
@@ -763,8 +765,10 @@ gkbd_keyboard_config_to_string (const GkbdKeyboardConfig * config)
 
 		/* Translators: The count is related to the number of options. The %s
 		 * format specifier should not be modified, left "as is". */
-		options = g_strdup_printf (ngettext ("option \"%s\"", "options \"%s\"",
-					count), buffer->str);
+		options =
+		    g_strdup_printf (ngettext
+				     ("option \"%s\"", "options \"%s\"",
+				      count), buffer->str);
 		g_string_truncate (buffer, 0);
 	}
 
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index ded9f17..a22322f 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -949,7 +949,7 @@ draw_key_label (GkbdKeyboardDrawingRenderContext * context,
 		}
 
 		if (drawing->track_modifiers) {
-			uint mods_rtrn;
+			guint mods_rtrn;
 			KeySym keysym;
 
 			if (XkbTranslateKeyCode (drawing->xkb, keycode,
@@ -1886,7 +1886,8 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 							    physical_indicators
 							    [i]->on =
 							    state;
-							create_cairo (drawing);
+							create_cairo
+							    (drawing);
 							draw_doodad
 							    (drawing->
 							     renderContext,
@@ -1894,7 +1895,8 @@ xkb_state_notify_event_filter (GdkXEvent * gdkxev,
 							     drawing->
 							     physical_indicators
 							     [i]);
-							destroy_cairo (drawing);
+							destroy_cairo
+							    (drawing);
 							invalidate_indicator_doodad_region
 							    (drawing,
 							     drawing->