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

Proposed by Charles Kerr on 2012-03-15
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 2012-03-15 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
1=== modified file 'debian/patches/61_unity_use_application_indicator.patch'
2--- debian/patches/61_unity_use_application_indicator.patch 2012-03-09 17:25:36 +0000
3+++ debian/patches/61_unity_use_application_indicator.patch 2012-03-15 19:15:22 +0000
4@@ -671,8 +671,8 @@
5 +static AppIndicator *app_indicator = NULL;
6 +static GkbdConfiguration *gkbd_configuration = NULL;
7 +static GkbdIndicatorConfig current_ind_config;
8-+GSList *groups_items_group = NULL;
9-+size_t lang_menu_items = 0;
10++static GSList *groups_items_group = NULL;
11++static size_t lang_menu_items = 0;
12 +
13 +static void state_callback (XklEngine * engine,
14 + XklEngineStateChange changeType,
15@@ -869,8 +869,8 @@
16 + XklEngineStateChange changeType,
17 + gint group, gboolean restore)
18 +{
19-+ if (changeType == GROUP_CHANGED)
20-+ popup_menu_set_group(GINT_TO_POINTER(group), TRUE);
21++ if ((changeType == GROUP_CHANGED) || (changeType == INDICATORS_CHANGED))
22++ popup_menu_set_group (GINT_TO_POINTER(group), TRUE);
23 +}
24 +
25 +static int
26@@ -1016,10 +1016,7 @@
27 +#endif
28 } else {
29 +#ifdef HAVE_APPINDICATOR
30-+ if (app_indicator != NULL) {
31-+ g_object_unref (app_indicator);
32-+ app_indicator = NULL;
33-+ }
34++ g_clear_object (&app_indicator);
35 +#else
36 if (icon != NULL) {
37 xkl_debug (150, "Destroying icon\n");
38@@ -1099,10 +1096,7 @@
39 xkl_engine = NULL;
40 +
41 +#ifdef HAVE_APPINDICATOR
42-+ if (gkbd_configuration) {
43-+ g_object_unref (gkbd_configuration);
44-+ gkbd_configuration = NULL;
45-+ }
46++ g_clear_object (&gkbd_configuration);
47 +#endif
48 +
49 inited_ok = FALSE;

Subscribers

People subscribed via source and target branches