Codebase list gnome-settings-daemon / 3e5ea90
Fix build without app indicators Fixes LP: #666806 (bzr r130.1.1) Rodrigo Moya 13 years ago
2 changed file(s) with 12 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
+8
-0
debian/changelog less more
0 gnome-settings-daemon (2.32.1-0ubuntu7) UNRELEASED; urgency=low
1
2 [ Maciej Katafiasz ]
3 * debian/patches/06_use_application_indicator.patch:
4 - Fix building without appindicators (LP: #666806)
5
6 -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 24 Feb 2011 18:18:18 +0100
7
08 gnome-settings-daemon (2.32.1-0ubuntu6) natty; urgency=low
19
210 * debian/patches/32-datetime-service-add-ntp-support.patch:
+4
-2
debian/patches/06_use_application_indicator.patch less more
1919 +
2020 +AC_ARG_ENABLE([appindicator],
2121 + AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]),
22 + [enable_appindicator="yes"],
22 + [enable_appindicator=$enableval],
2323 + [enable_appindicator="auto"])
2424 +
2525 +
10081008 }
10091009 }
10101010
1011 @@ -561,6 +782,14 @@
1011 @@ -561,6 +782,16 @@
10121012 gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
10131013 NULL);
10141014
1015 +#ifdef HAVE_APPINDICATOR
10151016 + gkbd_indicator_config_init (&current_ind_config, conf_client,
10161017 + xkl_engine);
10171018 + gkbd_indicator_config_load_from_gconf (&current_ind_config);
10191020 + gkbd_indicator_config_load_image_filenames (&current_ind_config,
10201021 + &current_kbd_config);
10211022 + gkbd_indicator_config_activate (&current_ind_config);
1023 +#endif /* HAVE_APPINDICATOR */
10221024 +
10231025 if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
10241026 if (filter_xkb_config ()) {