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

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-12-28 18:45:00 +0000 (Sun, 28 Dec 2008)
New Revision: 6374

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-actions.h
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.h
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-utils.c
   xfce4-screenshooter-plugin/trunk/src/main.c
Log:
Fix a bunch of compilation warnings.

Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-12-28 18:45:00 UTC (rev 6374)
@@ -1,5 +1,9 @@
 2008-12-28 jeromeg
 
+  * Fix a bunch of compilation warnings.
+
+2008-12-28 jeromeg
+
   * lib/screenshooter-dialogs.c (screenshooter_dialog_new): improve a 
     tooltip.
 

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-actions.h
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-actions.h	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-actions.h	2008-12-28 18:45:00 UTC (rev 6374)
@@ -17,7 +17,12 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * */
 
+#ifndef __HAVE_ACTIONS_H__
+#define __HAVE_ACTIONS_H__
+
 #include "screenshooter-utils.h"
 #include "screenshooter-dialogs.h"
 
 void screenshooter_take_and_output_screenshot (ScreenshotData *sd);
+
+#endif

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-12-28 18:45:00 UTC (rev 6374)
@@ -460,7 +460,7 @@
   GtkWidget *clipboard_radio_button;
     
 #ifdef HAVE_GIO
-  GtkWidget *open_with_label, *open_with_alignment;
+  GtkWidget *open_with_alignment;
   GtkWidget *open_with_box, *open_with_radio_button;
   
   GtkWidget *application_label;
@@ -979,7 +979,7 @@
                                     gchar          *default_dir)
 {
   GdkPixbuf *thumbnail;
-  gchar *filename = NULL, *savename = NULL;;
+  gchar *filename = NULL, *savename = NULL;
   
   GtkWidget *preview;
   GtkWidget *chooser;

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.h
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.h	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.h	2008-12-28 18:45:00 UTC (rev 6374)
@@ -16,6 +16,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+#ifndef __HAVE_DIALOGS_H__
+#define __HAVE_DIALOGS_H__
  
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -40,3 +43,4 @@
 *screenshooter_save_screenshot     (GdkPixbuf           *screenshot, 
                                     gboolean             show_save_dialog,
                                     gchar               *default_dir);
+#endif                                    

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-utils.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-utils.c	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-utils.c	2008-12-28 18:45:00 UTC (rev 6374)
@@ -124,12 +124,11 @@
 
 
 static GdkPixbuf
-*get_rectangle_screenshot ()
+*get_rectangle_screenshot (void)
 {
   GdkPixbuf *screenshot = NULL;
  
-  /* Get display and root window */
-  GdkDisplay *display = gdk_display_get_default ();
+  /* Get root window */
   GdkWindow *root_window =  gdk_get_default_root_window ();
   
   GdkGCValues gc_values;

Modified: xfce4-screenshooter-plugin/trunk/src/main.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/src/main.c	2008-12-28 11:15:05 UTC (rev 6373)
+++ xfce4-screenshooter-plugin/trunk/src/main.c	2008-12-28 18:45:00 UTC (rev 6374)
@@ -155,8 +155,9 @@
 int main(int argc, char **argv)
 {
   GError *cli_error = NULL;
-  GdkPixbuf *screenshot;
+  
   ScreenshotData *sd = g_new0 (ScreenshotData, 1);
+  
   gchar *rc_file = 
     xfce_resource_lookup (XFCE_RESOURCE_CONFIG, 
                           "xfce4/xfce4-screenshooter");