aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-07-08 09:36:52 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-07-08 09:36:52 -0400
commit5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641 (patch)
treea2b904d64fd68ca304540c20e00ec4137f2013cb /data
parent33d9b7f27eed027e1986ba4197d14434bc6ce37b (diff)
parentaf8dd7371a8743b02751fe2e71341f33de744fff (diff)
downloadayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.tar.gz
ayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.tar.bz2
ayatana-indicator-datetime-5b77a3aec6cef0cf0c1c34d9b185ea0f110c6641.zip
* New upstream release.
* libindicator 0.4 transition * Making preferences a gnome-control-center plugin * Calling gnome-control-center from the menu * Fixing timezone setting with new gsd * Dropped debian/patches/fix-timezones.patch: merged upstream
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.in1
-rw-r--r--data/datetime-dialog.ui6
-rw-r--r--data/indicator-datetime-preferences.desktop10
-rw-r--r--data/indicator-datetime-preferences.desktop.in10
4 files changed, 14 insertions, 13 deletions
diff --git a/data/Makefile.in b/data/Makefile.in
index 25d74ad..096db98 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -92,6 +92,7 @@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
+CCPANELDIR = @CCPANELDIR@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index 8479482..59d6753 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -134,13 +134,9 @@
<property name="step_increment">60</property>
<property name="page_increment">3600</property>
</object>
- <object class="GtkWindow" id="timeDateDialog">
+ <object class="GtkEventBox" id="timeDatePanel">
<property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="title" translatable="yes">Time &amp; Date</property>
- <property name="resizable">False</property>
- <property name="icon_name">time-admin</property>
- <property name="type_hint">dialog</property>
<child>
<object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
diff --git a/data/indicator-datetime-preferences.desktop b/data/indicator-datetime-preferences.desktop
index 9871ecf..8231e22 100644
--- a/data/indicator-datetime-preferences.desktop
+++ b/data/indicator-datetime-preferences.desktop
@@ -4,11 +4,13 @@ Version=1.0
Name=Time & Date
Comment=Change your clock and date settings
-Icon=time-admin
-TryExec=indicator-datetime-preferences
-Exec=indicator-datetime-preferences
+Icon=preferences-system-time
+TryExec=gnome-control-center
+Exec=gnome-control-center indicator-datetime
StartupNotify=true
Type=Application
-Categories=GNOME;GTK;Utility;DesktopSettings;Settings;
+Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+X-GNOME-Settings-Panel=indicator-datetime
+OnlyShowIn=Unity;
diff --git a/data/indicator-datetime-preferences.desktop.in b/data/indicator-datetime-preferences.desktop.in
index f37765b..226ae67 100644
--- a/data/indicator-datetime-preferences.desktop.in
+++ b/data/indicator-datetime-preferences.desktop.in
@@ -4,11 +4,13 @@ Version=1.0
_Name=Time & Date
_Comment=Change your clock and date settings
-Icon=time-admin
-TryExec=indicator-datetime-preferences
-Exec=indicator-datetime-preferences
+Icon=preferences-system-time
+TryExec=gnome-control-center
+Exec=gnome-control-center indicator-datetime
StartupNotify=true
Type=Application
-Categories=GNOME;GTK;Utility;DesktopSettings;Settings;
+Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+X-GNOME-Settings-Panel=indicator-datetime
+OnlyShowIn=Unity;