GNOME Settings Daemon

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

  1. lp-885730
  2. Merge into ubuntu
Proposed by Charles Kerr
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~charlesk/gnome-settings-daemon/lp-885730
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 49 lines (+6/-12)
1 file modified
debian/patches/61_unity_use_application_indicator.patch (+6/-12)
To merge this branch: bzr merge lp:~charlesk/gnome-settings-daemon/lp-885730
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+97726@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
671+static AppIndicator *app_indicator = NULL;671+static AppIndicator *app_indicator = NULL;
672+static GkbdConfiguration *gkbd_configuration = NULL;672+static GkbdConfiguration *gkbd_configuration = NULL;
673+static GkbdIndicatorConfig current_ind_config;673+static GkbdIndicatorConfig current_ind_config;
674+GSList *groups_items_group = NULL;674+static GSList *groups_items_group = NULL;
675+size_t lang_menu_items = 0;675+static size_t lang_menu_items = 0;
676+676+
677+static void state_callback (XklEngine * engine,677+static void state_callback (XklEngine * engine,
678+ XklEngineStateChange changeType,678+ XklEngineStateChange changeType,
@@ -869,8 +869,8 @@
869+ XklEngineStateChange changeType,869+ XklEngineStateChange changeType,
870+ gint group, gboolean restore)870+ gint group, gboolean restore)
871+{871+{
872+ if (changeType == GROUP_CHANGED)872+ if ((changeType == GROUP_CHANGED) || (changeType == INDICATORS_CHANGED))
873+ popup_menu_set_group(GINT_TO_POINTER(group), TRUE);873+ popup_menu_set_group (GINT_TO_POINTER(group), TRUE);
874+}874+}
875+875+
876+static int876+static int
@@ -1016,10 +1016,7 @@
1016+#endif1016+#endif
1017 } else {1017 } else {
1018+#ifdef HAVE_APPINDICATOR1018+#ifdef HAVE_APPINDICATOR
1019+ if (app_indicator != NULL) {1019+ g_clear_object (&app_indicator);
1020+ g_object_unref (app_indicator);
1021+ app_indicator = NULL;
1022+ }
1023+#else1020+#else
1024 if (icon != NULL) {1021 if (icon != NULL) {
1025 xkl_debug (150, "Destroying icon\n");1022 xkl_debug (150, "Destroying icon\n");
@@ -1099,10 +1096,7 @@
1099 xkl_engine = NULL;1096 xkl_engine = NULL;
1100+1097+
1101+#ifdef HAVE_APPINDICATOR1098+#ifdef HAVE_APPINDICATOR
1102+ if (gkbd_configuration) {1099+ g_clear_object (&gkbd_configuration);
1103+ g_object_unref (gkbd_configuration);
1104+ gkbd_configuration = NULL;
1105+ }
1106+#endif1100+#endif
1107+1101+
1108 inited_ok = FALSE;1102 inited_ok = FALSE;

Subscribers

People subscribed via source and target branches