[Goodies-commits] r5506 - in xfce4-screenshooter-plugin/trunk: . src

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-10-03 13:05:43 +0000 (Fri, 03 Oct 2008)
New Revision: 5506

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/NEWS
   xfce4-screenshooter-plugin/trunk/src/screenshooter-utils.c
Log:
Fix a crash due to a null pointer.

Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-10-02 21:22:40 UTC (rev 5505)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-10-03 13:05:43 UTC (rev 5506)
@@ -1,5 +1,12 @@
-2008-19-20 jeromeg
+2008-10-02 jeromeg
 
+  * src/screenshooter-utils.c: in (take_screenshot), don't crash when taking a
+  screenshot of of the desktop when xfdesktop does not display desktop icons,
+  null pointer...
+  * NEWS: updated.
+
+2008-09-20 jeromeg
+
   * src/main.c:
     - (main) plug some leaks with the dir and screenshot_dir.
     - (main) don't use screenshot_dir to store the dirname, it should be done

Modified: xfce4-screenshooter-plugin/trunk/NEWS
===================================================================
--- xfce4-screenshooter-plugin/trunk/NEWS	2008-10-02 21:22:40 UTC (rev 5505)
+++ xfce4-screenshooter-plugin/trunk/NEWS	2008-10-03 13:05:43 UTC (rev 5506)
@@ -4,6 +4,8 @@
   * Add some default icons taken from the Rodent icon theme to make sure the
   applet has an icon.
   * Plug some remaining leaks and remove some useless code in main.
+  * Fix a crash when using the screenshooter to take a screenshot of the desktop
+  when xfdesktop is set up not to display any icons.
   
 === Version 1.3.2 ===
   * BUGFIX: plug some stupid leaks.

Modified: xfce4-screenshooter-plugin/trunk/src/screenshooter-utils.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/src/screenshooter-utils.c	2008-10-02 21:22:40 UTC (rev 5505)
+++ xfce4-screenshooter-plugin/trunk/src/screenshooter-utils.c	2008-10-03 13:05:43 UTC (rev 5506)
@@ -152,7 +152,8 @@
       
       /* If we are supposed to take a screenshot of the active window, and if 
       the active window is the desktop background, grab the whole screen.*/      
-      if (gdk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_DESKTOP)
+      if (gdk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_DESKTOP ||
+          window == NULL)
         {
           window = gdk_get_default_root_window ();
           needs_unref = FALSE;