[gnome-panel/gtk3] Adapt to arguments changes in gdk_rgba_parse() and gdk_window_get_geometry()



commit 30ac93e4edc44bb34b0135de7804a17e7b12c664
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Wed Dec 29 22:41:52 2010 +0100

    Adapt to arguments changes in gdk_rgba_parse() and gdk_window_get_geometry()
    
    Prototypes for these two functions have changed in GDK 3. gdk_rgba_parse()
    has swapped color and spec, and gdk_window_get_geometry() has lost it's
    depth argument.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=627455

 gnome-panel/panel-background-monitor.c |    2 +-
 libpanel-applet/panel-applet.c         |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gnome-panel/panel-background-monitor.c b/gnome-panel/panel-background-monitor.c
index 1c5c652..700b14b 100644
--- a/gnome-panel/panel-background-monitor.c
+++ b/gnome-panel/panel-background-monitor.c
@@ -424,7 +424,7 @@ panel_background_monitor_setup_pixbuf (PanelBackgroundMonitor *monitor)
 	}
 
 	gdk_window_get_geometry (monitor->gdkwindow,
-				 NULL, NULL, &rwidth, &rheight, NULL);
+				 NULL, NULL, &rwidth, &rheight);
 
 	monitor->width  = MIN (pwidth,  rwidth);
 	monitor->height = MIN (pheight, rheight);
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index d659474..74b09a1 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -1471,8 +1471,7 @@ panel_applet_get_background (PanelApplet *applet)
 	} else if (elements [0] && !strcmp (elements [0], "color")) {
                 GdkRGBA color;
 
-		if (!elements [1] || !gdk_rgba_parse (elements [1], &color)) {
-
+		if (!elements [1] || !gdk_rgba_parse (&color, elements [1])) {
 			g_warning ("Incomplete '%s' background type received", elements [0]);
 			goto out;
 		}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]