Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center/files: gnome-control-center-3.8.0-paths.patch gnome-control-center-3.8.0-paths-makefiles.patch gnome-control-center-3.8.0-optional.patch gnome-control-center-3.7.4-optional-kerberos.patch
Date: Thu, 28 Mar 2013 23:08:10
Message-Id: 20130328230807.6A1342171D@flycatcher.gentoo.org
1 pacho 13/03/28 23:08:07
2
3 Added: gnome-control-center-3.8.0-paths.patch
4 gnome-control-center-3.8.0-paths-makefiles.patch
5 gnome-control-center-3.8.0-optional.patch
6 gnome-control-center-3.7.4-optional-kerberos.patch
7 Log:
8 Version bump for Gnome 3.8
9
10 (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
11
12 Revision Changes Path
13 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths.patch?rev=1.1&content-type=text/plain
17
18 Index: gnome-control-center-3.8.0-paths.patch
19 ===================================================================
20 Use Gentoo-appropriate absolute paths
21
22 Original author: Alexandre Rostovtsev <tetromino@g.o>
23 ---
24
25 --- a/panels/datetime/test-endianess.c
26 +++ b/panels/datetime/test-endianess.c
27 @@ -38,11 +38,11 @@
28 return 0;
29 }
30
31 - dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
32 + dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
33 if (dir == NULL) {
34 /* Try with /usr/share/locale/
35 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
36 - dir = g_dir_open ("/usr/share/locale/", 0, NULL);
37 + dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
38 if (dir == NULL) {
39 return 1;
40 }
41 --- a/panels/datetime/test-timezone.c
42 +++ b/panels/datetime/test-timezone.c
43 @@ -1,7 +1,7 @@
44 #include <gtk/gtk.h>
45 #include "cc-timezone-map.h"
46
47 -#define TZ_DIR "/usr/share/zoneinfo/"
48 +#define TZ_DIR REALDATADIR "/zoneinfo/"
49
50 static GList *
51 get_timezone_list (GList *tzs,
52 --- a/panels/datetime/tz.h
53 +++ b/panels/datetime/tz.h
54 @@ -29,9 +29,9 @@
55 #include <glib.h>
56
57 #ifndef __sun
58 -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
59 +# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
60 #else
61 -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
62 +# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
63 #endif
64
65 typedef struct _TzDB TzDB;
66 --- a/panels/printers/cc-printers-panel.c
67 +++ b/panels/printers/cc-printers-panel.c
68 @@ -2199,8 +2199,8 @@
69
70 if (printer_name)
71 {
72 - const gchar *const dirs[] = { "/usr/share/cups",
73 - "/usr/local/share/cups",
74 + const gchar *const dirs[] = { REALDATADIR "/cups",
75 + PREFIX "/local/share/cups",
76 NULL };
77 const gchar *testprint[] = { "%s/data/testprint",
78 "%s/data/testprint.ps",
79 --- a/panels/printers/pp-host.c
80 +++ b/panels/printers/pp-host.c
81 @@ -251,7 +251,7 @@
82 data->devices->devices = NULL;
83
84 argv = g_new0 (gchar *, 3);
85 - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
86 + argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
87 argv[1] = g_strdup (priv->hostname);
88
89 /* Use SNMP to get printer's informations */
90
91
92
93 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths-makefiles.patch
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths-makefiles.patch?rev=1.1&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-paths-makefiles.patch?rev=1.1&content-type=text/plain
97
98 Index: gnome-control-center-3.8.0-paths-makefiles.patch
99 ===================================================================
100 --- panels/datetime/Makefile.am~ 2013-03-15 12:59:32.000000000 +0100
101 +++ panels/datetime/Makefile.am 2013-03-27 13:00:45.269448422 +0100
102 @@ -24,6 +24,7 @@
103 $(DATETIME_PANEL_CFLAGS) \
104 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
105 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
106 + -DREALDATADIR="\"$(datadir)\"" \
107 $(NULL)
108
109 noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
110 --- panels/printers/Makefile.am~ 2013-03-15 12:59:32.000000000 +0100
111 +++ panels/printers/Makefile.am 2013-03-27 13:01:55.161013404 +0100
112 @@ -7,6 +7,9 @@
113 $(SMBCLIENT_CFLAGS) \
114 -I$(top_srcdir)/shell/ \
115 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
116 + -DREALDATADIR="\"$(datadir)\"" \
117 + -DPREFIX="\"$(prefix)\"" \
118 + -DLIBEXECDIR="\"$(libexecdir)\"" \
119 $(NULL)
120
121 noinst_LTLIBRARIES = libprinters.la
122
123
124
125 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch
126
127 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch?rev=1.1&view=markup
128 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch?rev=1.1&content-type=text/plain
129
130 Index: gnome-control-center-3.8.0-optional.patch
131 ===================================================================
132 --- configure.ac.old 2013-03-27 12:32:00.730437955 +0100
133 +++ configure.ac 2013-03-27 12:45:04.380808177 +0100
134 @@ -143,13 +143,51 @@
135 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
136 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
137 PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
138 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
139 +
140 +build_online_accounts=false
141 +AC_ARG_ENABLE(goa,
142 + AC_HELP_STRING([--disable-goa],
143 + [disable online accounts management panel]),
144 + [case "${enableval}" in
145 + yes) WANT_ONLINE_ACCOUNTS=yes ;;
146 + no) WANT_ONLINE_ACCOUNTS=no ;;
147 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
148 + esac],
149 + [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
150 +
151 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
152 + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
153 + build_online_accounts=true
154 +fi
155 +AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
156 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
157 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
158 +
159 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
160 gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
161 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
162 - colord >= $COLORD_REQUIRED_VERSION
163 - colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
164 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
165 +
166 +build_color=false
167 +AC_ARG_ENABLE(color,
168 + AC_HELP_STRING([--disable-color],
169 + [disable color management panel]),
170 + [case "${enableval}" in
171 + yes) WANT_COLOR=yes ;;
172 + no) WANT_COLOR=no ;;
173 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
174 + esac],
175 + [WANT_COLOR=yes]) dnl Default value
176 +
177 +if test x$WANT_COLOR = xyes; then
178 + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
179 + colord >= $COLORD_REQUIRED_VERSION
180 + colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
181 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
182 + build_color=true
183 +fi
184 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
185 +AC_SUBST(COLOR_PANEL_CFLAGS)
186 +AC_SUBST(COLOR_PANEL_LIBS)
187 +
188 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
189 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
190 PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
191 @@ -210,17 +248,25 @@
192 fi
193 AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
194
195 -# Check for gnome-bluetooth
196 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
197 - [have_bluetooth=yes], have_bluetooth=no)
198 -if test "x$have_bluetooth" = xyes ; then
199 - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
200 -fi
201 -AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
202 -if test x${have_bluetooth} = xyes; then
203 - AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
204 +have_bluetooth=false
205 +AC_ARG_ENABLE(bluetooth,
206 + AC_HELP_STRING([--disable-bluetooth],
207 + [disable bluetooth management panel]),
208 + [case "${enableval}" in
209 + yes) WANT_BLUETOOTH=yes ;;
210 + no) WANT_BLUETOOTH=no ;;
211 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
212 + esac],
213 + [WANT_BLUETOOTH=yes]) dnl Default value
214 +
215 +if test x$WANT_BLUETOOTH = xyes; then
216 + # Check for gnome-bluetooth
217 + PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
218 + have_bluetooth=true
219 fi
220
221 +AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
222 +
223 # Check for smbclient
224 PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
225
226 @@ -289,12 +335,23 @@
227 if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
228 have_wacom=no
229 else
230 - PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
231 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION
232 - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
233 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
234 - AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
235 - have_wacom=yes
236 + AC_ARG_ENABLE(wacom,
237 + AC_HELP_STRING([--disable-wacom],
238 + [disable wacom management panel]),
239 + [case "${enableval}" in
240 + yes) WANT_WACOM=yes ;;
241 + no) WANT_WACOM=no ;;
242 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
243 + esac],
244 + [WANT_WACOM=yes]) dnl Default value
245 +
246 + if test x$WANT_WACOM = xyes; then
247 + PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
248 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION
249 + xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
250 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
251 + have_wacom=yes
252 + fi
253 fi
254 ;;
255 *)
256 @@ -555,6 +612,11 @@
257 else
258 AC_MSG_NOTICE([ Bluetooth panel disabled])
259 fi
260 +if test "x$build_color" = "xtrue"; then
261 + AC_MSG_NOTICE([** colord (Color panel)])
262 +else
263 + AC_MSG_NOTICE([ Color panel disabled])
264 +fi
265 if test "x$enable_cups" = "xyes"; then
266 AC_MSG_NOTICE([** CUPS (Printers panel)])
267 else
268 @@ -565,11 +627,21 @@
269 else
270 AC_MSG_NOTICE([ Users panel webcam support disabled])
271 fi
272 +if test "x$build_online_accounts" = "xtrue"; then
273 + AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
274 +else
275 + AC_MSG_NOTICE([ Online Accounts panel disabled])
276 +fi
277 if test "x$with_libsocialweb" = "xyes"; then
278 AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
279 else
280 AC_MSG_NOTICE([ Background panel Flickr support disabled])
281 fi
282 +if test "x$build_wacom" = "xtrue"; then
283 + AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
284 +else
285 + AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
286 +fi
287 if test "x$have_wacom" = "xyes"; then
288 AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
289 else
290 --- panels/Makefile.am.old 2013-03-27 12:45:13.852761402 +0100
291 +++ panels/Makefile.am 2013-03-27 12:46:26.328393242 +0100
292 @@ -2,11 +2,9 @@
293 common \
294 background \
295 power \
296 - color \
297 display \
298 mouse \
299 notifications \
300 - online-accounts \
301 region \
302 info \
303 sound \
304 @@ -18,6 +16,10 @@
305 privacy \
306 sharing
307
308 +if BUILD_COLOR
309 +SUBDIRS += color
310 +endif
311 +
312 if BUILD_WACOM
313 SUBDIRS += wacom
314 endif
315 @@ -34,4 +36,8 @@
316 SUBDIRS += bluetooth
317 endif
318
319 +if BUILD_ONLINE_ACCOUNTS
320 +SUBDIRS += online-accounts
321 +endif
322 +
323 -include $(top_srcdir)/git.mk
324
325
326
327 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch
328
329 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch?rev=1.1&view=markup
330 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch?rev=1.1&content-type=text/plain
331
332 Index: gnome-control-center-3.7.4-optional-kerberos.patch
333 ===================================================================
334 From 75c944a788beb749a28086025876406b7864baf5 Mon Sep 17 00:00:00 2001
335 From: Sobhan Mohammadpour <sobhanmohammadpour1@×××××.fr>
336 Date: Tue, 19 Feb 2013 16:40:37 +0330
337 Subject: [PATCH] gnome-control-center-3.7.4-optional-kerberos
338 originaly by Priit Laes <pleas@×××××.org>
339 Crappy patch to allow disabling kerberos requirement
340 https://bugzilla.gnome.org/show_bug.cgi?id=686840
341 ---
342 panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
343 panels/user-accounts/um-realm-manager.c | 2 ++
344 2 files changed, 28 insertions(+), 4 deletions(-)
345
346 diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
347 index 88dff99..5f50087 100644
348 --- a/panels/user-accounts/um-account-dialog.c
349 +++ b/panels/user-accounts/um-account-dialog.c
350 @@ -27,9 +27,12 @@
351 #include <act/act.h>
352
353 #include "um-account-dialog.h"
354 -#include "um-realm-manager.h"
355 #include "um-utils.h"
356
357 +#ifdef KERBEROS
358 +#include "um-realm-manager.h"
359 +#endif
360 +
361 typedef enum {
362 UM_LOCAL,
363 UM_ENTERPRISE,
364 @@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self,
365
366 static void dialog_validate (UmAccountDialog *self);
367
368 +#ifdef KERBEROS
369 static void on_join_login (GObject *source,
370 GAsyncResult *result,
371 gpointer user_data);
372 @@ -48,6 +52,7 @@ static void on_join_login (GObject *source,
373 static void on_realm_joined (GObject *source,
374 GAsyncResult *result,
375 gpointer user_data);
376 +#endif
377
378 #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
379 UmAccountDialogClass))
380 @@ -83,6 +88,7 @@ struct _UmAccountDialog {
381 gboolean enterprise_domain_chosen;
382 GtkEntry *enterprise_login;
383 GtkEntry *enterprise_password;
384 +#ifdef KERBEROS
385 UmRealmManager *realm_manager;
386 UmRealmObject *selected_realm;
387
388 @@ -92,6 +98,7 @@ struct _UmAccountDialog {
389 GtkEntry *join_name;
390 GtkEntry *join_password;
391 gboolean join_prompted;
392 +#endif
393 };
394
395 struct _UmAccountDialogClass {
396 @@ -300,6 +307,7 @@ local_prepare (UmAccountDialog *self)
397 gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
398 }
399
400 +#ifdef KERBEROS
401 static gboolean
402 enterprise_validate (UmAccountDialog *self)
403 {
404 @@ -504,7 +512,6 @@ on_join_response (GtkDialog *dialog,
405 on_join_login,
406 g_object_ref (self));
407 }
408 -
409 static void
410 join_show_prompt (UmAccountDialog *self,
411 GError *error)
412 @@ -892,6 +899,7 @@ enterprise_prepare (UmAccountDialog *self)
413 gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
414 gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
415 }
416 +#endif
417
418 static void
419 dialog_validate (UmAccountDialog *self)
420 @@ -902,9 +910,11 @@ dialog_validate (UmAccountDialog *self)
421 case UM_LOCAL:
422 valid = local_validate (self);
423 break;
424 +#ifdef KERBEROS
425 case UM_ENTERPRISE:
426 valid = enterprise_validate (self);
427 break;
428 +#endif
429 default:
430 valid = FALSE;
431 break;
432 @@ -990,12 +1000,14 @@ on_local_toggle (GtkToggleButton *toggle,
433 mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
434 }
435
436 +#ifdef KERBEROS
437 static void
438 on_enterprise_toggle (GtkToggleButton *toggle,
439 gpointer user_data)
440 {
441 mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
442 }
443 +#endif
444
445 static void
446 mode_init (UmAccountDialog *self,
447 @@ -1007,15 +1019,18 @@ mode_init (UmAccountDialog *self,
448
449 widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
450 self->mode_areas[UM_LOCAL] = widget;
451 +#ifdef KERBEROS
452 widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
453 self->mode_areas[UM_ENTERPRISE] = widget;
454 -
455 +#endif
456 widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
457 g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
458 self->mode_buttons[UM_LOCAL] = widget;
459 +#ifdef KERBEROS
460 widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
461 g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
462 self->mode_buttons[UM_ENTERPRISE] = widget;
463 +#endif
464 }
465
466 static void
467 @@ -1073,8 +1088,10 @@ um_account_dialog_init (UmAccountDialog *self)
468 self->container_widget = widget;
469
470 local_init (self, builder);
471 +#ifdef KERBEROS
472 enterprise_init (self, builder);
473 join_init (self, builder);
474 +#endif
475 mode_init (self, builder);
476
477 g_object_unref (builder);
478 @@ -1092,9 +1109,11 @@ um_account_dialog_response (GtkDialog *dialog,
479 case UM_LOCAL:
480 local_create_user (self);
481 break;
482 +#ifdef KERBEROS
483 case UM_ENTERPRISE:
484 enterprise_add_user (self);
485 break;
486 +#endif
487 default:
488 g_assert_not_reached ();
489 }
490 @@ -1115,6 +1134,7 @@ um_account_dialog_dispose (GObject *obj)
491 if (self->cancellable)
492 g_cancellable_cancel (self->cancellable);
493
494 +#ifdef KERBEROS
495 if (self->realmd_watch)
496 g_bus_unwatch_name (self->realmd_watch);
497 self->realmd_watch = 0;
498 @@ -1126,7 +1146,7 @@ um_account_dialog_dispose (GObject *obj)
499 g_object_unref (self->realm_manager);
500 self->realm_manager = NULL;
501 }
502 -
503 +#endif
504 G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
505 }
506
507 @@ -1179,7 +1199,9 @@ um_account_dialog_show (UmAccountDialog *self,
508 self->cancellable = g_cancellable_new ();
509
510 local_prepare (self);
511 +#ifdef KERBEROS
512 enterprise_prepare (self);
513 +#endif
514 mode_change (self, UM_LOCAL);
515 dialog_validate (self);
516
517 diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
518 index 59d57b3..d3390f4 100644
519 --- a/panels/user-accounts/um-realm-manager.c
520 +++ b/panels/user-accounts/um-realm-manager.c
521 @@ -21,6 +21,7 @@
522
523 #include "config.h"
524
525 +#ifdef KERBEROS
526 #include "um-realm-manager.h"
527
528 #include <krb5/krb5.h>
529 @@ -899,3 +900,4 @@ um_realm_login_finish (GAsyncResult *result,
530
531 return TRUE;
532 }
533 +#endif
534 --
535 1.8.1.2
Report Message
Find on MARC Find on Google Groups