| 1 |
eva 14/04/27 16:50:40 |
| 2 |
|
| 3 |
Added: gnome-control-center-3.12.1-optional.patch |
| 4 |
Log: |
| 5 |
Version bump for Gnome 3.12. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnome-control-center-3.12.1-optional.patch |
| 16 |
=================================================================== |
| 17 |
From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Fri, 25 Apr 2014 22:17:24 +0200 |
| 20 |
Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional |
| 21 |
|
| 22 |
Upstream is not interested in any part of this patch: |
| 23 |
|
| 24 |
https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
| 25 |
https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
| 26 |
https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
| 27 |
|
| 28 |
Dropped mm from this revision of the patch since it appears more |
| 29 |
complicated than ever to split it from the network panel. |
| 30 |
|
| 31 |
Signed-Off: Gilles Dartiguelongue <eva@g.o> |
| 32 |
--- |
| 33 |
configure.ac | 146 ++++++++++++++++++++++++++------ |
| 34 |
panels/Makefile.am | 10 ++- |
| 35 |
panels/user-accounts/um-realm-manager.c | 9 ++ |
| 36 |
shell/Makefile.am | 10 ++- |
| 37 |
shell/cc-panel-loader.c | 8 ++ |
| 38 |
5 files changed, 153 insertions(+), 30 deletions(-) |
| 39 |
|
| 40 |
diff --git a/configure.ac b/configure.ac |
| 41 |
index 511f78d..f82108e 100644 |
| 42 |
--- a/configure.ac |
| 43 |
+++ b/configure.ac |
| 44 |
@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
| 45 |
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) |
| 46 |
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
| 47 |
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) |
| 48 |
-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
| 49 |
+ |
| 50 |
+build_online_accounts=false |
| 51 |
+AC_ARG_ENABLE(goa, |
| 52 |
+ AC_HELP_STRING([--disable-goa], |
| 53 |
+ [disable online accounts management panel]), |
| 54 |
+ [case "${enableval}" in |
| 55 |
+ yes) WANT_ONLINE_ACCOUNTS=yes ;; |
| 56 |
+ no) WANT_ONLINE_ACCOUNTS=no ;; |
| 57 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; |
| 58 |
+ esac], |
| 59 |
+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value |
| 60 |
+ |
| 61 |
+if test x$WANT_ONLINE_ACCOUNTS = xyes; then |
| 62 |
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
| 63 |
+ build_online_accounts=true |
| 64 |
+fi |
| 65 |
+if test "x$build_online_accounts" = xtrue ; then |
| 66 |
+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
| 67 |
+fi |
| 68 |
+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") |
| 69 |
+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) |
| 70 |
+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) |
| 71 |
+ |
| 72 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 |
| 73 |
gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
| 74 |
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
| 75 |
- colord >= $COLORD_REQUIRED_VERSION |
| 76 |
- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
| 77 |
- libsoup-2.4 |
| 78 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
| 79 |
+ |
| 80 |
+build_color=false |
| 81 |
+AC_ARG_ENABLE(color, |
| 82 |
+ AC_HELP_STRING([--disable-color], |
| 83 |
+ [disable color management panel]), |
| 84 |
+ [case "${enableval}" in |
| 85 |
+ yes) WANT_COLOR=yes ;; |
| 86 |
+ no) WANT_COLOR=no ;; |
| 87 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
| 88 |
+ esac], |
| 89 |
+ [WANT_COLOR=yes]) dnl Default value |
| 90 |
+ |
| 91 |
+if test x$WANT_COLOR = xyes; then |
| 92 |
+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
| 93 |
+ colord >= $COLORD_REQUIRED_VERSION |
| 94 |
+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
| 95 |
+ libsoup-2.4 |
| 96 |
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
| 97 |
+ build_color=true |
| 98 |
+fi |
| 99 |
+if test "x$build_color" = xtrue ; then |
| 100 |
+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
| 101 |
+fi |
| 102 |
+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
| 103 |
+AC_SUBST(COLOR_PANEL_CFLAGS) |
| 104 |
+AC_SUBST(COLOR_PANEL_LIBS) |
| 105 |
+ |
| 106 |
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
| 107 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
| 108 |
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
| 109 |
@@ -206,8 +250,25 @@ fi |
| 110 |
AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
| 111 |
|
| 112 |
# Check for gnome-bluetooth |
| 113 |
-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, |
| 114 |
- [have_bluetooth=yes], have_bluetooth=no) |
| 115 |
+have_bluetooth=no |
| 116 |
+AC_ARG_ENABLE(bluetooth, |
| 117 |
+ AC_HELP_STRING([--disable-bluetooth], |
| 118 |
+ [disable bluetooth management panel]), |
| 119 |
+ [case "${enableval}" in |
| 120 |
+ yes) WANT_BLUETOOTH=yes ;; |
| 121 |
+ no) WANT_BLUETOOTH=no ;; |
| 122 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
| 123 |
+ esac], |
| 124 |
+ [WANT_BLUETOOTH=yes]) dnl Default value |
| 125 |
+ |
| 126 |
+if test x$WANT_BLUETOOTH = xyes; then |
| 127 |
+ # Check for gnome-bluetooth |
| 128 |
+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, |
| 129 |
+ [have_bluetooth=yes], have_bluetooth=no) |
| 130 |
+ have_bluetooth=yes |
| 131 |
+fi |
| 132 |
+ |
| 133 |
+ |
| 134 |
if test "x$have_bluetooth" = xyes ; then |
| 135 |
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
| 136 |
fi |
| 137 |
@@ -292,15 +353,27 @@ case $host_os in |
| 138 |
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
| 139 |
have_wacom=no |
| 140 |
else |
| 141 |
- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
| 142 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
| 143 |
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
| 144 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
| 145 |
- clutter-gtk-1.0 |
| 146 |
- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
| 147 |
- have_wacom=yes |
| 148 |
- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
| 149 |
- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
| 150 |
+ AC_ARG_ENABLE(wacom, |
| 151 |
+ AC_HELP_STRING([--disable-wacom], |
| 152 |
+ [disable wacom management panel]), |
| 153 |
+ [case "${enableval}" in |
| 154 |
+ yes) WANT_WACOM=yes ;; |
| 155 |
+ no) WANT_WACOM=no ;; |
| 156 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
| 157 |
+ esac], |
| 158 |
+ [WANT_WACOM=yes]) dnl Default value |
| 159 |
+ |
| 160 |
+ if test x$WANT_WACOM = xyes; then |
| 161 |
+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
| 162 |
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
| 163 |
+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
| 164 |
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
| 165 |
+ clutter-gtk-1.0 |
| 166 |
+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
| 167 |
+ have_wacom=yes |
| 168 |
+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
| 169 |
+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
| 170 |
+ fi |
| 171 |
fi |
| 172 |
;; |
| 173 |
*) |
| 174 |
@@ -310,16 +383,22 @@ esac |
| 175 |
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
| 176 |
|
| 177 |
# Kerberos kerberos support |
| 178 |
-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
| 179 |
-if test "$KRB5_CONFIG" = "no"; then |
| 180 |
- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
| 181 |
-fi |
| 182 |
- |
| 183 |
-AC_MSG_CHECKING(for krb5 libraries and flags) |
| 184 |
-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
| 185 |
-KRB5_LIBS="`$KRB5_CONFIG --libs`" |
| 186 |
-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
| 187 |
+AC_ARG_ENABLE([kerberos], |
| 188 |
+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, |
| 189 |
+ [enable_kerberos=yes]) |
| 190 |
+ |
| 191 |
+if test x"$enable_kerberos" != x"no" ; then |
| 192 |
+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
| 193 |
+ if test "$KRB5_CONFIG" = "no"; then |
| 194 |
+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
| 195 |
+ fi |
| 196 |
|
| 197 |
+ AC_MSG_CHECKING(for krb5 libraries and flags) |
| 198 |
+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
| 199 |
+ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
| 200 |
+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
| 201 |
+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
| 202 |
+fi |
| 203 |
AC_SUBST(KRB5_CFLAGS) |
| 204 |
AC_SUBST(KRB5_LIBS) |
| 205 |
|
| 206 |
@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then |
| 207 |
else |
| 208 |
AC_MSG_NOTICE([ Bluetooth panel disabled]) |
| 209 |
fi |
| 210 |
+if test "x$build_color" = "xtrue"; then |
| 211 |
+ AC_MSG_NOTICE([** colord (Color panel)]) |
| 212 |
+else |
| 213 |
+ AC_MSG_NOTICE([ Color panel disabled]) |
| 214 |
+fi |
| 215 |
if test "x$enable_cups" = "xyes"; then |
| 216 |
AC_MSG_NOTICE([** CUPS (Printers panel)]) |
| 217 |
else |
| 218 |
@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then |
| 219 |
else |
| 220 |
AC_MSG_NOTICE([ Users panel webcam support disabled]) |
| 221 |
fi |
| 222 |
+if test "x$build_online_accounts" = "xtrue"; then |
| 223 |
+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
| 224 |
+else |
| 225 |
+ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
| 226 |
+fi |
| 227 |
+if test "x$build_wacom" = "xtrue"; then |
| 228 |
+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) |
| 229 |
+else |
| 230 |
+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) |
| 231 |
+fi |
| 232 |
if test "x$have_wacom" = "xyes"; then |
| 233 |
AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
| 234 |
else |
| 235 |
diff --git a/panels/Makefile.am b/panels/Makefile.am |
| 236 |
index 9961c25..0c54622 100644 |
| 237 |
--- a/panels/Makefile.am |
| 238 |
+++ b/panels/Makefile.am |
| 239 |
@@ -2,11 +2,9 @@ SUBDIRS= \ |
| 240 |
common \ |
| 241 |
background \ |
| 242 |
power \ |
| 243 |
- color \ |
| 244 |
display \ |
| 245 |
mouse \ |
| 246 |
notifications \ |
| 247 |
- online-accounts \ |
| 248 |
region \ |
| 249 |
info \ |
| 250 |
sound \ |
| 251 |
@@ -18,6 +16,10 @@ SUBDIRS= \ |
| 252 |
privacy \ |
| 253 |
sharing |
| 254 |
|
| 255 |
+if BUILD_COLOR |
| 256 |
+SUBDIRS += color |
| 257 |
+endif |
| 258 |
+ |
| 259 |
if BUILD_WACOM |
| 260 |
SUBDIRS += wacom |
| 261 |
endif |
| 262 |
@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
| 263 |
SUBDIRS += bluetooth |
| 264 |
endif |
| 265 |
|
| 266 |
+if BUILD_ONLINE_ACCOUNTS |
| 267 |
+SUBDIRS += online-accounts |
| 268 |
+endif |
| 269 |
+ |
| 270 |
-include $(top_srcdir)/git.mk |
| 271 |
diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
| 272 |
index 0849160..58d50a6 100644 |
| 273 |
--- a/panels/user-accounts/um-realm-manager.c |
| 274 |
+++ b/panels/user-accounts/um-realm-manager.c |
| 275 |
@@ -22,7 +22,9 @@ |
| 276 |
|
| 277 |
#include "um-realm-manager.h" |
| 278 |
|
| 279 |
+#ifdef HAVE_KERBEROS |
| 280 |
#include <krb5/krb5.h> |
| 281 |
+#endif |
| 282 |
|
| 283 |
#include <glib.h> |
| 284 |
#include <glib/gi18n.h> |
| 285 |
@@ -696,6 +698,7 @@ login_closure_free (gpointer data) |
| 286 |
g_slice_free (LoginClosure, login); |
| 287 |
} |
| 288 |
|
| 289 |
+#ifdef HAVE_KERBEROS |
| 290 |
static krb5_error_code |
| 291 |
login_perform_kinit (krb5_context k5, |
| 292 |
const gchar *realm, |
| 293 |
@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, |
| 294 |
|
| 295 |
return code; |
| 296 |
} |
| 297 |
+#endif /* HAVE_KERBEROS */ |
| 298 |
|
| 299 |
static void |
| 300 |
kinit_thread_func (GSimpleAsyncResult *async, |
| 301 |
GObject *object, |
| 302 |
GCancellable *cancellable) |
| 303 |
{ |
| 304 |
+#ifdef HAVE_KERBEROS |
| 305 |
LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
| 306 |
krb5_context k5 = NULL; |
| 307 |
krb5_error_code code; |
| 308 |
@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
| 309 |
|
| 310 |
if (k5) |
| 311 |
krb5_free_context (k5); |
| 312 |
+#else /* HAVE_KERBEROS */ |
| 313 |
+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
| 314 |
+ _("gnome-control-center was built without kerberos support")); |
| 315 |
+#endif |
| 316 |
} |
| 317 |
|
| 318 |
void |
| 319 |
diff --git a/shell/Makefile.am b/shell/Makefile.am |
| 320 |
index ad7a68f..cc968ac 100644 |
| 321 |
--- a/shell/Makefile.am |
| 322 |
+++ b/shell/Makefile.am |
| 323 |
@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \ |
| 324 |
$(top_builddir)/libgd/libgd.la \ |
| 325 |
$(top_builddir)/panels/common/liblanguage.la \ |
| 326 |
$(top_builddir)/panels/background/libbackground.la \ |
| 327 |
- $(top_builddir)/panels/color/libcolor.la \ |
| 328 |
$(top_builddir)/panels/datetime/libdate_time.la \ |
| 329 |
$(top_builddir)/panels/display/libdisplay.la \ |
| 330 |
$(top_builddir)/panels/info/libinfo.la \ |
| 331 |
$(top_builddir)/panels/keyboard/libkeyboard.la \ |
| 332 |
$(top_builddir)/panels/mouse/libmouse-properties.la \ |
| 333 |
$(top_builddir)/panels/notifications/libnotifications.la \ |
| 334 |
- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
| 335 |
$(top_builddir)/panels/power/libpower.la \ |
| 336 |
$(top_builddir)/panels/privacy/libprivacy.la \ |
| 337 |
$(top_builddir)/panels/region/libregion.la \ |
| 338 |
@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH |
| 339 |
gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
| 340 |
endif |
| 341 |
|
| 342 |
+if BUILD_COLOR |
| 343 |
+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
| 344 |
+endif |
| 345 |
+ |
| 346 |
+if BUILD_ONLINE_ACCOUNTS |
| 347 |
+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
| 348 |
+endif |
| 349 |
+ |
| 350 |
AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" |
| 351 |
|
| 352 |
# Dbus service file |
| 353 |
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
| 354 |
index 26576dc..8a92f95 100644 |
| 355 |
--- a/shell/cc-panel-loader.c |
| 356 |
+++ b/shell/cc-panel-loader.c |
| 357 |
@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
| 358 |
#ifdef BUILD_BLUETOOTH |
| 359 |
extern GType cc_bluetooth_panel_get_type (void); |
| 360 |
#endif /* BUILD_BLUETOOTH */ |
| 361 |
+#ifdef BUILD_COLOR |
| 362 |
extern GType cc_color_panel_get_type (void); |
| 363 |
+#endif /* BUILD_COLOR */ |
| 364 |
extern GType cc_date_time_panel_get_type (void); |
| 365 |
extern GType cc_display_panel_get_type (void); |
| 366 |
extern GType cc_info_panel_get_type (void); |
| 367 |
@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
| 368 |
extern GType cc_network_panel_get_type (void); |
| 369 |
#endif /* BUILD_NETWORK */ |
| 370 |
extern GType cc_notifications_panel_get_type (void); |
| 371 |
+#ifdef BUILD_ONLINE_ACCOUNTS |
| 372 |
extern GType cc_goa_panel_get_type (void); |
| 373 |
+#endif /* BUILD_ONLINE_ACCOUNTS */ |
| 374 |
extern GType cc_power_panel_get_type (void); |
| 375 |
#ifdef BUILD_PRINTERS |
| 376 |
extern GType cc_printers_panel_get_type (void); |
| 377 |
@@ -77,7 +81,9 @@ static struct { |
| 378 |
#ifdef BUILD_BLUETOOTH |
| 379 |
PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
| 380 |
#endif |
| 381 |
+#ifdef BUILD_COLOR |
| 382 |
PANEL_TYPE("color", cc_color_panel_get_type ), |
| 383 |
+#endif |
| 384 |
PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
| 385 |
PANEL_TYPE("display", cc_display_panel_get_type ), |
| 386 |
PANEL_TYPE("info", cc_info_panel_get_type ), |
| 387 |
@@ -87,7 +93,9 @@ static struct { |
| 388 |
PANEL_TYPE("network", cc_network_panel_get_type ), |
| 389 |
#endif |
| 390 |
PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
| 391 |
+#ifdef BUILD_ONLINE_ACCOUNTS |
| 392 |
PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
| 393 |
+#endif |
| 394 |
PANEL_TYPE("power", cc_power_panel_get_type ), |
| 395 |
#ifdef BUILD_PRINTERS |
| 396 |
PANEL_TYPE("printers", cc_printers_panel_get_type ), |
| 397 |
-- |
| 398 |
1.9.0 |
Archives