gnome-utils r8175 - trunk/gnome-screenshot

[cosimoc svn gnome org]

Author: cosimoc
Date: Sat Nov  8 14:34:42 2008
New Revision: 8175
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8175&view=rev

Log:
2008-11-08  Cosimo Cecchi  <cosimoc gnome org>

	* gnome-screenshot.c: (finish_prepare_screenshot):
	Don't try to include the window border when doing fullscreen
	captures (#559532).


Modified:
   trunk/gnome-screenshot/ChangeLog
   trunk/gnome-screenshot/gnome-screenshot.c
   trunk/gnome-screenshot/screenshot-xfer.c

Modified: trunk/gnome-screenshot/gnome-screenshot.c
==============================================================================
--- trunk/gnome-screenshot/gnome-screenshot.c	(original)
+++ trunk/gnome-screenshot/gnome-screenshot.c	Sat Nov  8 14:34:42 2008
@@ -712,7 +712,11 @@
 {  
   ScreenshotDialog *dialog;
 
-  screenshot = screenshot_get_pixbuf (window, include_pointer, include_border);
+  /* always disable window border for full-desktop screenshots */
+  if (!take_window_shot)
+    screenshot = screenshot_get_pixbuf (window, include_pointer, FALSE);
+  else
+    screenshot = screenshot_get_pixbuf (window, include_pointer, include_border);
 
   if (take_window_shot) {
     switch (border_effect[0])

Modified: trunk/gnome-screenshot/screenshot-xfer.c
==============================================================================
--- trunk/gnome-screenshot/screenshot-xfer.c	(original)
+++ trunk/gnome-screenshot/screenshot-xfer.c	Sat Nov  8 14:34:42 2008
@@ -369,7 +369,7 @@
 void
 screenshot_xfer_uri (GFile *source_file,
                      GFile *target_file,
-		     GtkWidget *parent,
+                     GtkWidget *parent,
                      TransferCallback done_callback,
                      gpointer done_callback_data)
 {