[Xfce4-commits] [xfce/xfce4-power-manager] 03/63: common: fix deprecated warnings

[noreply at xfce.org]

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

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit f0a4570a3dc3ab62331ccd5bc6f48e0a730cff43
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Mar 2 08:15:25 2015 +0300

    common: fix deprecated warnings
---
 common/xfpm-brightness.c |    4 ++--
 common/xfpm-common.c     |   31 +++++++++++--------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
index 9680aa3..066e44c 100644
--- a/common/xfpm-brightness.c
+++ b/common/xfpm-brightness.c
@@ -160,11 +160,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
     if (!XRRQueryExtension (gdk_x11_get_default_xdisplay (), &event_base, &error_base) ||
 	!XRRQueryVersion (gdk_x11_get_default_xdisplay (), &major, &minor) )
     {
-	gdk_error_trap_pop ();
+	gdk_error_trap_pop_ignored ();
 	g_warning ("No XRANDR extension found");
 	return FALSE;
     }
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     if (major == 1 && minor < 2)
     {
diff --git a/common/xfpm-common.c b/common/xfpm-common.c
index 51283b6..51afc4a 100644
--- a/common/xfpm-common.c
+++ b/common/xfpm-common.c
@@ -139,32 +139,23 @@ gboolean xfpm_is_multihead_connected (void)
 {
     GdkDisplay *dpy;
     GdkScreen *screen;
-    gint nscreen;
     gint nmonitor;
     
     dpy = gdk_display_get_default ();
-    
-    nscreen = gdk_display_get_n_screens (dpy);
-    
-    if ( nscreen == 1 )
+
+    screen = gdk_display_get_screen (dpy, 0);
+    if ( screen )
     {
-	screen = gdk_display_get_screen (dpy, 0);
-	if ( screen )
+	nmonitor = gdk_screen_get_n_monitors (screen);
+	if ( nmonitor > 1 )
 	{
-	    nmonitor = gdk_screen_get_n_monitors (screen);
-	    if ( nmonitor > 1 )
-	    {
-		g_debug ("Multiple monitor connected");
-		return TRUE; 
-	    }
-	    else
-		return FALSE;
+	    g_debug ("Multiple monitor connected");
+	    return TRUE;
+	}
+	else
+	{
+	    return FALSE;
 	}
-    }
-    else if ( nscreen > 1 )
-    {
-	g_debug ("Multiple screen connected");
-	return TRUE;
     }
     
     return FALSE;

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