[mate-panel] add patches

Wolfgang Ulbrich raveit65 at fedoraproject.org
Fri Nov 28 21:01:48 UTC 2014


commit 78538201eb39fd224063b4c4d837153f2b8e234a
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Nov 28 22:01:43 2014 +0100

    add patches

 ...-panel_fix-container_child_background_set.patch |   13 +++++++++
 mate-panel_timezone.patch                          |   28 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/mate-panel_fix-container_child_background_set.patch b/mate-panel_fix-container_child_background_set.patch
new file mode 100644
index 0000000..9b1f07b
--- /dev/null
+++ b/mate-panel_fix-container_child_background_set.patch
@@ -0,0 +1,13 @@
+diff -upr mate-panel-1.8.1-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c mate-panel-1.8.1/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+--- mate-panel-1.8.1-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c	2014-11-25 23:40:54.555704000 +0100
++++ mate-panel-1.8.1/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c	2014-11-25 23:50:09.499401035 +0100
+@@ -333,8 +333,7 @@ mate_panel_applet_frame_dbus_finalize (G
+ 	MatePanelAppletFrameDBus *frame = MATE_PANEL_APPLET_FRAME_DBUS (object);
+ 
+ 	if (frame->priv->bg_cancellable)
+-		g_object_unref (frame->priv->bg_cancellable);
+-	frame->priv->bg_cancellable = NULL;
++        g_cancellable_cancel (frame->priv->bg_cancellable);
+ 
+ 	G_OBJECT_CLASS (mate_panel_applet_frame_dbus_parent_class)->finalize (object);
+ }
diff --git a/mate-panel_timezone.patch b/mate-panel_timezone.patch
new file mode 100644
index 0000000..b89bd69
--- /dev/null
+++ b/mate-panel_timezone.patch
@@ -0,0 +1,28 @@
+diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c
+index 28b3525..525921c 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 (*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);
+ 
+


More information about the scm-commits mailing list