Create EMPATHY_RECT_IS_ON_SCREEN macro instead of duplicating its code.

diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index b807425ea27c5fe95982520d0e4e9a6da6a4ca20..abf50d623cf7041e3f56238c9fbb6185a9171f63 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -30,6 +30,7 @@
 
 #include "libempathy/empathy-utils.h"
 #include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
@@ -147,9 +148,7 @@ empathy_geometry_save (GtkWindow *window,
   maximized = (window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
 
   /* Don't save off-screen positioning */
-  if (x + w < 0 || y + h < 0 ||
-      x > gdk_screen_width () ||
-      y > gdk_screen_height ())
+  if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
     return;
 
   key_file = geometry_get_key_file ();

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index be6aaa24998fa11d7eef4eacc39a810696520619..9ba01738df4d2909513ed0fb3122ebb095ada3e5 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1313,9 +1313,7 @@ empathy_window_present (GtkWindow *window,
                 * reposition on the current workspace. */
                gtk_window_get_position (window, &x, &y);
                gtk_window_get_size (window, &w, &h);
-               if (x + w < 0 || y + h < 0 ||
-                   x > gdk_screen_width () ||
-                   y > gdk_screen_height ())
+               if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
                        gtk_widget_hide (GTK_WIDGET (window));
        }
 

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 486301cb13a22ff5013898044d46e49105de7cd0..7bec0884e9e9f46990e5c3d6f875d1af2046a6c3 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -41,6 +41,11 @@
 
 G_BEGIN_DECLS
 
+#define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \
+                                           (y) + (h) > 0 && \
+                                           (x) < gdk_screen_width () && \
+                                           (y) < gdk_screen_height ())
+
 void            empathy_gtk_init                        (void);
 GRegex *        empathy_uri_regex_dup_singleton         (void);