diff options
| author | György Balló <ballogy@freestart.hu> | 2011-11-23 07:59:47 +0100 |
|---|---|---|
| committer | György Balló <ballogy@freestart.hu> | 2011-11-23 07:59:47 +0100 |
| commit | 78e082682d5d833fd271899b67d6a203acffa803 (patch) | |
| tree | 4abe1c6a2e6bb3414356f846086a8f18b9919c33 /src | |
| parent | ba87e5cb673992cee0fcb0bb3c90523974836a30 (diff) | |
| download | ayatana-indicator-datetime-78e082682d5d833fd271899b67d6a203acffa803.tar.gz ayatana-indicator-datetime-78e082682d5d833fd271899b67d6a203acffa803.tar.bz2 ayatana-indicator-datetime-78e082682d5d833fd271899b67d6a203acffa803.zip | |
Make Control Center panel optional
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/datetime-service.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 254022e..aa04900 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ +if BUILD_CCPANEL ccpaneldir = $(CCPANELDIR) ccpanel_LTLIBRARIES = libindicator-datetime.la +endif libexec_PROGRAMS = indicator-datetime-service @@ -42,6 +44,7 @@ libdatetime_la_LDFLAGS = \ -module \ -avoid-version +if BUILD_CCPANEL libindicator_datetime_la_SOURCES =\ datetime-prefs.c \ datetime-prefs-locations.c \ @@ -62,6 +65,7 @@ libindicator_datetime_la_LIBADD = \ $(top_builddir)/libmap/libmap.la \ $(PREF_LIBS) libindicator_datetime_la_LDFLAGS = -module -avoid-version +endif gen-%.xml.c: %.xml @echo "Building $@ from $<" diff --git a/src/datetime-service.c b/src/datetime-service.c index ed8c8e3..f004c4a 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -1146,7 +1146,11 @@ build_menus (DbusmenuMenuitem * root) dbusmenu_menuitem_property_set (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings…")); /* insensitive until we check for available apps */ dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE); + #ifdef HAVE_CCPANEL g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center indicator-datetime"); + #else + g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center datetime"); + #endif /* HAVE_CCPANEL */ dbusmenu_menuitem_child_append(root, settings); g_idle_add(check_for_timeadmin, NULL); } |