[Xfce4-commits] [xfce/xfce4-panel] 01/01: Fix the systray background

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-panel.

commit fdbef84f81f2e4cc15675a04029d1e3656de7db7
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Mar 2 22:52:55 2017 +0100

    Fix the systray background
---
 plugins/systray/systray-manager.c |  3 +--
 plugins/systray/systray.c         | 12 +++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c
index ac820eb..e24b192 100644
--- a/plugins/systray/systray-manager.c
+++ b/plugins/systray/systray-manager.c
@@ -343,8 +343,7 @@ systray_manager_register (SystrayManager  *manager,
   manager->invisible = g_object_ref (G_OBJECT (invisible));
 
   /* set the visial property for transparent tray icons */
-  if (gtk_check_version (2, 16, 0) == NULL)
-    systray_manager_set_visual (manager);
+  systray_manager_set_visual (manager);
 
   /* get the current x server time stamp */
   timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (invisible)));
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 0d85fb3..965642b 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -55,7 +55,8 @@ static gboolean systray_plugin_size_changed                 (XfcePanelPlugin
                                                              gint                   size);
 static void     systray_plugin_configure_plugin             (XfcePanelPlugin       *panel_plugin);
 static void     systray_plugin_box_draw                     (GtkWidget             *box,
-                                                             cairo_t               *cr);
+                                                             cairo_t               *cr,
+                                                             gpointer               user_data);
 static void     systray_plugin_button_toggled               (GtkWidget             *button,
                                                              SystrayPlugin         *plugin);
 static void     systray_plugin_button_set_arrow             (SystrayPlugin         *plugin);
@@ -613,8 +614,8 @@ systray_plugin_box_draw_icon (GtkWidget *child,
       if (alloc.x > -1 && alloc.y > -1)
         {
           // FIXME
-          //gdk_cairo_set_source_pixmap (cr, gtk_widget_get_window (child),
-          //                             alloc.x, alloc.y);
+          gdk_cairo_set_source_window (cr, gtk_widget_get_window (child),
+                                       alloc.x, alloc.y);
           cairo_paint (cr);
         }
     }
@@ -624,7 +625,8 @@ systray_plugin_box_draw_icon (GtkWidget *child,
 
 static void
 systray_plugin_box_draw (GtkWidget *box,
-                         cairo_t   *cr)
+                         cairo_t   *cr,
+                         gpointer   user_data)
 {
   panel_return_if_fail (cr != NULL);
 
@@ -634,7 +636,7 @@ systray_plugin_box_draw (GtkWidget *box,
   /* separately draw all the composed tray icons after gtk
    * handled the draw event */
   gtk_container_foreach (GTK_CONTAINER (box),
-                         systray_plugin_box_draw_icon, cr);
+                         (GtkCallback) systray_plugin_box_draw_icon, cr);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.