Merge lp:~charlesk/gnome-settings-daemon/lp-885730 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Charles Kerr]

=== modified file 'debian/patches/61_unity_use_application_indicator.patch'
--- debian/patches/61_unity_use_application_indicator.patch	2012-03-09 17:25:36 +0000
+++ debian/patches/61_unity_use_application_indicator.patch	2012-03-15 19:15:22 +0000
@@ -671,8 +671,8 @@
 +static AppIndicator *app_indicator = NULL;
 +static GkbdConfiguration *gkbd_configuration = NULL;
 +static GkbdIndicatorConfig current_ind_config;
-+GSList *groups_items_group = NULL;
-+size_t lang_menu_items = 0;
++static GSList *groups_items_group = NULL;
++static size_t lang_menu_items = 0;
 +
 +static void state_callback (XklEngine * engine,
 +                            XklEngineStateChange changeType,
@@ -869,8 +869,8 @@
 +		XklEngineStateChange changeType,
 +		gint group, gboolean restore)
 +{
-+	if (changeType == GROUP_CHANGED)
-+		popup_menu_set_group(GINT_TO_POINTER(group), TRUE);
++	if ((changeType == GROUP_CHANGED) || (changeType == INDICATORS_CHANGED))
++		popup_menu_set_group (GINT_TO_POINTER(group), TRUE);
 +}
 +
 +static int
@@ -1016,10 +1016,7 @@
 +#endif
  	} else {
 +#ifdef HAVE_APPINDICATOR
-+		if (app_indicator != NULL) {
-+			g_object_unref (app_indicator);
-+			app_indicator = NULL;
-+		}
++		g_clear_object (&app_indicator);
 +#else
  		if (icon != NULL) {
  			xkl_debug (150, "Destroying icon\n");
@@ -1099,10 +1096,7 @@
  	xkl_engine = NULL;
 +
 +#ifdef HAVE_APPINDICATOR
-+	if (gkbd_configuration) {
-+		g_object_unref (gkbd_configuration);
-+		gkbd_configuration = NULL;
-+	}
++	g_clear_object (&gkbd_configuration);
 +#endif
 +
  	inited_ok = FALSE;