aboutsummaryrefslogtreecommitdiff
path: root/libmap
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 /libmap
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 'libmap')
-rw-r--r--libmap/Makefile.in1
-rw-r--r--libmap/cc-timezone-map.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/libmap/Makefile.in b/libmap/Makefile.in
index 44d6f90..3c4ea45 100644
--- a/libmap/Makefile.in
+++ b/libmap/Makefile.in
@@ -134,6 +134,7 @@ CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
+CCPANELDIR = @CCPANELDIR@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
diff --git a/libmap/cc-timezone-map.c b/libmap/cc-timezone-map.c
index 5ce1354..aeac9a0 100644
--- a/libmap/cc-timezone-map.c
+++ b/libmap/cc-timezone-map.c
@@ -686,10 +686,6 @@ cc_timezone_map_realize (GtkWidget *widget)
window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr,
GDK_WA_X | GDK_WA_Y);
- gtk_widget_set_style (widget,
- gtk_style_attach (gtk_widget_get_style (widget),
- window));
-
gdk_window_set_user_data (window, widget);
cursor = gdk_cursor_new (GDK_HAND2);