ayatana-commits team mailing list archive

[Mirco Müller <mirco.mueller@xxxxxxxxxxxxx>]

Mirco Müller has proposed merging lp:~macslow/notify-osd/fix-375408 into lp:notify-osd.

Requested reviews:
    Notify OSD Developers (notify-osd-developers)

Due to some people having huge multi-monitor setups the max. values for the desktop-struts were to small causing bubbles being wrongly positioned on such big multi-screen setups, because fallback max. values were too small (see LP: #375408). This branch fixes the issue.
-- 
https://code.launchpad.net/~macslow/notify-osd/fix-375408/+merge/11779
Your team ayatana-commits is subscribed to branch lp:notify-osd.

=== modified file 'src/defaults.c'
--- src/defaults.c	2009-09-10 13:16:07 +0000
+++ src/defaults.c	2009-09-15 12:38:22 +0000
@@ -1350,7 +1350,7 @@
 				"desktop-width",
 				"Width of desktop in pixels",
 				0,
-				4096,
+				G_MAXINT,
 				gdk_screen_get_width (screen),
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
@@ -1363,7 +1363,7 @@
 				"desktop-height",
 				"Height of desktop in pixels",
 				0,
-				4096,
+				G_MAXINT,
 				gdk_screen_get_height (screen),
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
@@ -1376,7 +1376,7 @@
 				"desktop-top",
 				"Top of desktop in pixels",
 				0,
-				4096,
+				G_MAXINT,
 				0,
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
@@ -1389,8 +1389,8 @@
 				"desktop-bottom",
 				"Bottom of desktop in pixels",
 				0,
-				4096,
-				4096,
+				G_MAXINT,
+				G_MAXINT,
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
 	g_object_class_install_property (gobject_class,
@@ -1402,7 +1402,7 @@
 				"desktop-left",
 				"Left of desktop in pixels",
 				0,
-				4096,
+				G_MAXINT,
 				0,
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
@@ -1415,8 +1415,8 @@
 				"desktop-right",
 				"Right of desktop in pixels",
 				0,
-				4096,
-				4096,
+				G_MAXINT,
+				G_MAXINT,
 				G_PARAM_CONSTRUCT |
 				G_PARAM_READWRITE);
 	g_object_class_install_property (gobject_class,

=== modified file 'tests/test-defaults.c'
--- tests/test-defaults.c	2009-09-10 13:11:32 +0000
+++ tests/test-defaults.c	2009-09-15 12:38:22 +0000
@@ -58,7 +58,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_width (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_width (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_width (defaults), >=, 640);
 	g_object_unref (defaults);
 }
@@ -70,7 +70,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_height (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_height (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_height (defaults), >=, 600);
 	g_object_unref (defaults);
 }
@@ -82,7 +82,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_top (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_top (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_top (defaults), >=, 0);
 	g_object_unref (defaults);
 }
@@ -94,7 +94,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_bottom (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_bottom (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_bottom (defaults), >=, 0);
 	g_object_unref (defaults);
 }
@@ -106,7 +106,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_left (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_left (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_left (defaults), >=, 0);
 	g_object_unref (defaults);
 }
@@ -118,7 +118,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_desktop_right (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_desktop_right (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_desktop_right (defaults), >=, 0);
 	g_object_unref (defaults);
 }
@@ -130,7 +130,7 @@
 	Defaults* defaults = NULL;
 
 	defaults = defaults_new ();
-	g_assert_cmpint (defaults_get_stack_height (defaults), <=, 4096);
+	g_assert_cmpint (defaults_get_stack_height (defaults), <=, G_MAXINT);
 	g_assert_cmpint (defaults_get_stack_height (defaults), >=, 0);
 	g_object_unref (defaults);
 }