diff options
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/clock/system-timezone.c | 16 | ||||
| -rw-r--r-- | applets/notification_area/na-tray-manager.c | 2 | ||||
| -rw-r--r-- | applets/wncklet/window-menu.c | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c index 28b3525b..b736ffee 100644 --- a/applets/clock/system-timezone.c +++ b/applets/clock/system-timezone.c @@ -634,6 +634,22 @@ system_timezone_read_etc_localtime_softlink (void) return NULL; file = g_file_read_link (ETC_LOCALTIME, NULL); + + if (!g_path_is_absolute (file)) { + GFile *gf1; + GFile *gf2; + + /* Resolve relative path. */ + gf1 = g_file_new_for_path (ETC_LOCALTIME); + gf2 = g_file_get_parent (gf1); + g_object_unref (gf1); + gf1 = g_file_resolve_relative_path (gf2, file); + g_object_unref (gf2); + g_free (file); + file = g_file_get_path (gf1); + g_object_unref (gf1); + } + tz = system_timezone_strip_path_if_valid (file); g_free (file); diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c index 4fcb3614..45720d3a 100644 --- a/applets/notification_area/na-tray-manager.c +++ b/applets/notification_area/na-tray-manager.c @@ -298,8 +298,8 @@ na_tray_manager_handle_dock_request (NaTrayManager *manager, if (!gtk_socket_get_plug_window (GTK_SOCKET (child))) { /* Embedding failed, we won't get a plug-removed signal */ + /* This signal destroys the socket */ g_signal_emit (manager, manager_signals[TRAY_ICON_REMOVED], 0, child); - gtk_widget_destroy (child); return; } diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c index 7a2f5498..7ddb2f83 100644 --- a/applets/wncklet/window-menu.c +++ b/applets/wncklet/window-menu.c @@ -177,7 +177,7 @@ static inline void force_no_focus_padding(GtkWidget* widget) provider = gtk_css_provider_new (); gtk_css_provider_load_from_data (provider, - "#window-menu-applet-button {\n" + "#PanelApplet-window-menu-applet-button {\n" " border-width: 0px;\n" " -GtkWidget-focus-line-width: 0px;\n" " -GtkWidget-focus-padding: 0px; }", |