[Pkg-galago-commit] r448 - packages/unstable/notification-daemon/debian/patches

[Riccardo Setti]

Author: giskard
Date: 2006-11-18 14:43:25 +0100 (Sat, 18 Nov 2006)
New Revision: 448

Modified:
   packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_stack_c.patch
   packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_theme_c.patch
Log:
fixed 03* patches

Modified: packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_stack_c.patch
===================================================================
--- packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_stack_c.patch	2006-11-18 13:38:27 UTC (rev 447)
+++ packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_stack_c.patch	2006-11-18 13:43:25 UTC (rev 448)
@@ -16,7 +16,7 @@
 -	int result;
 -	GdkScreen *screen;
 -	int disp_screen;
-+	GdkScreen *screen
++	GdkScreen *screen;
  
 +	/* It would be best to allow the user to configure this, but the first
 +	 * monitor is a good default for now (the first monitor is likely the

Modified: packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_theme_c.patch
===================================================================
--- packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_theme_c.patch	2006-11-18 13:38:27 UTC (rev 447)
+++ packages/unstable/notification-daemon/debian/patches/03_fix_xinerama_theme_c.patch	2006-11-18 13:43:25 UTC (rev 448)
@@ -1,67 +1,3 @@
-diff -urNad notification-daemon-0.3.6.orig/src/stack.c notification-daemon-0.3.6/src/stack.c
---- notification-daemon-0.3.6.orig/src/stack.c	2006-07-30 23:19:57.000000000 +0200
-+++ notification-daemon-0.3.6/src/stack.c	2006-11-18 14:20:04.000000000 +0100
-@@ -40,51 +40,18 @@
- static gboolean
- get_work_area(GtkWidget *nw, GdkRectangle *rect)
- {
--	Atom workarea = XInternAtom(GDK_DISPLAY(), "_NET_WORKAREA", True);
--	Atom type;
--	Window win;
--	int format;
--	gulong num, leftovers;
--	gulong max_len = 4 * 32;
--	guchar *ret_workarea;
--	long *workareas;
--	int result;
--	GdkScreen *screen;
--	int disp_screen;
-+	GdkScreen *screen
- 
-+	/* It would be best to allow the user to configure this, but the first
-+	 * monitor is a good default for now (the first monitor is likely the
-+	 * primary monitor). */
-+	 
-+	guint monitor = 0;
-+	
- 	gtk_widget_realize(nw);
- 	screen = gdk_drawable_get_screen(GDK_DRAWABLE(nw->window));
--	disp_screen = GDK_SCREEN_XNUMBER(screen);
--
--	/* Defaults in case of error */
--	rect->x = 0;
--	rect->y = 0;
--	rect->width = gdk_screen_get_width(screen);
--	rect->height = gdk_screen_get_height(screen);
--
--	if (workarea == None)
--		return FALSE;
--
--	win = XRootWindow(GDK_DISPLAY(), disp_screen);
--	result = XGetWindowProperty(GDK_DISPLAY(), win, workarea, 0,
--								max_len, False, AnyPropertyType,
--								&type, &format, &num, &leftovers,
--								&ret_workarea);
--
--	if (result != Success || type == None || format == 0 || leftovers ||
--		num % 4)
--	{
--		return FALSE;
--	}
--
--	workareas = (long *)ret_workarea;
--	rect->x      = workareas[disp_screen * 4];
--	rect->y      = workareas[disp_screen * 4 + 1];
--	rect->width  = workareas[disp_screen * 4 + 2];
--	rect->height = workareas[disp_screen * 4 + 3];
--
--	XFree(ret_workarea);
--
-+	
-+	gdk_screen_get_monitor_geometry(screen, monitor, rect);
- 	return TRUE;
- }
- 
 diff -urNad notification-daemon-0.3.6.orig/themes/standard/theme.c notification-daemon-0.3.6/themes/standard/theme.c
 --- notification-daemon-0.3.6.orig/themes/standard/theme.c	2006-09-07 19:28:27.000000000 +0200
 +++ notification-daemon-0.3.6/themes/standard/theme.c	2006-11-18 14:26:56.000000000 +0100