raveit65 pushed to mate-panel (f22). "add fix-container_child_background_set.patch and remove old ones"

[notifications at fedoraproject.org]

From 999d8f81f99fa1e58e090bba02591d65f99173fe Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Fri, 22 May 2015 13:14:40 +0200
Subject: add fix-container_child_background_set.patch and remove old ones


diff --git a/mate-panel_fix-container_child_background_set.patch b/mate-panel_fix-container_child_background_set.patch
deleted file mode 100644
index 9b1f07b..0000000
--- a/mate-panel_fix-container_child_background_set.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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_fix-gtk-style-context.patch b/mate-panel_fix-gtk-style-context.patch
new file mode 100644
index 0000000..c7c9e26
--- /dev/null
+++ b/mate-panel_fix-gtk-style-context.patch
@@ -0,0 +1,46 @@
+diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
+index 3dbe6c5..94debf0 100644
+--- a/libmate-panel-applet/mate-panel-applet.c
++++ b/libmate-panel-applet/mate-panel-applet.c
+@@ -2051,18 +2051,18 @@ void _mate_panel_applet_apply_css(GtkWidget* widget, MatePanelAppletBackgroundTy
+ 
+ 	switch (type) {
+ 	case PANEL_NO_BACKGROUND:
+-		gtk_style_context_remove_class(context,"-mate-custom-panel-background");
++		gtk_style_context_remove_class(context,"mate-custom-panel-background");
+ 		break;
+ 	case PANEL_COLOR_BACKGROUND:
+ 	case PANEL_PIXMAP_BACKGROUND:
+ 		provider = gtk_css_provider_new ();
+ 		gtk_css_provider_load_from_data (provider,
+-						".-mate-custom-panel-background{\n"
++						".mate-custom-panel-background{\n"
+ 						" background-color: rgba (0, 0, 0, 0);\n"
+ 						" background-image: none;\n"
+ 						"}",
+ 						-1, NULL);
+-		gtk_style_context_add_class (context, "-mate-custom-panel-background");
++		gtk_style_context_add_class (context, "mate-custom-panel-background");
+ 		gtk_style_context_add_provider (context,
+ 						GTK_STYLE_PROVIDER (provider),
+ 						GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c
+index d7b61f6..9beb000 100644
+--- a/mate-panel/panel-background.c
++++ b/mate-panel/panel-background.c
+@@ -106,12 +106,12 @@ void panel_background_apply_css (GtkWidget* widget)
+ 	gtk_widget_reset_style(widget);
+ 	provider = gtk_css_provider_new ();
+ 	gtk_css_provider_load_from_data (provider,
+-					 ".-mate-custom-panel-background{\n"
++					 ".mate-custom-panel-background{\n"
+ 					 " background-color: rgba (0, 0, 0, 0);\n"
+ 					 " background-image: none;\n"
+ 					 "}",
+ 					 -1, NULL);
+-	gtk_style_context_add_class (context, "-mate-custom-panel-background");
++	gtk_style_context_add_class (context, "mate-custom-panel-background");
+ 	gtk_style_context_add_provider (context,
+ 					GTK_STYLE_PROVIDER (provider),
+ 					GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
diff --git a/mate-panel_notification-area-prevent-crash.patch b/mate-panel_notification-area-prevent-crash.patch
deleted file mode 100644
index 95b347e..0000000
--- a/mate-panel_notification-area-prevent-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c
-index 4fcb361..45720d3 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/mate-panel_timezone.patch b/mate-panel_timezone.patch
deleted file mode 100644
index b89bd69..0000000
--- a/mate-panel_timezone.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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);
- 
-
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-panel.git/commit/?h=f22&id=999d8f81f99fa1e58e090bba02591d65f99173fe