[Xfce4-commits] r29942 - in libexo/trunk: . exo exo-open

[Nick Schermer]

Author: nick
Date: 2009-05-11 19:42:21 +0000 (Mon, 11 May 2009)
New Revision: 29942

Modified:
   libexo/trunk/ChangeLog
   libexo/trunk/exo-open/main.c
   libexo/trunk/exo/exo-cell-renderer-icon.c
   libexo/trunk/exo/exo-job.c
Log:
	* exo/exo-job.c, exo/exo-cell-renderer-icon.c: Fix compiler warnings.
	* exo-open/main.c: Ignore unknown options so the user can send
	  arguments to the exo-open terminal parameters.

Modified: libexo/trunk/ChangeLog
===================================================================
--- libexo/trunk/ChangeLog	2009-05-11 19:19:51 UTC (rev 29941)
+++ libexo/trunk/ChangeLog	2009-05-11 19:42:21 UTC (rev 29942)
@@ -1,3 +1,9 @@
+2009-05-11	Nick Schermer <nick at xfce.org>
+
+	* exo/exo-job.c, exo/exo-cell-renderer-icon.c: Fix compiler warnings.
+	* exo-open/main.c: Ignore unknown options so the user can send
+	  arguments to the exo-open terminal parameters.
+
 2009-05-05	Jannis Pohlmann <jannis at xfce.org>
 
 	* configure.in.in: Add hint that we'll need to update library version 

Modified: libexo/trunk/exo/exo-cell-renderer-icon.c
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-icon.c	2009-05-11 19:19:51 UTC (rev 29941)
+++ libexo/trunk/exo/exo-cell-renderer-icon.c	2009-05-11 19:42:21 UTC (rev 29942)
@@ -374,8 +374,8 @@
   GdkRectangle                      draw_area;
   GtkStateType                      state;
   const gchar                      *filename;
-  GtkIconInfo                      *icon_info;
-  GdkPixbuf                        *icon;
+  GtkIconInfo                      *icon_info = NULL;
+  GdkPixbuf                        *icon = NULL;
   GdkPixbuf                        *temp;
   GError                           *err = NULL;
   gchar                            *display_name = NULL;

Modified: libexo/trunk/exo/exo-job.c
===================================================================
--- libexo/trunk/exo/exo-job.c	2009-05-11 19:19:51 UTC (rev 29941)
+++ libexo/trunk/exo/exo-job.c	2009-05-11 19:42:21 UTC (rev 29942)
@@ -600,7 +600,7 @@
   gchar  *message;
 
   _exo_return_if_fail (EXO_IS_JOB (job));
-  _exo_return_if_fail (message != NULL);
+  _exo_return_if_fail (format != NULL);
 
   va_start (var_args, format);
   message = g_strdup_vprintf (format, var_args);

Modified: libexo/trunk/exo-open/main.c
===================================================================
--- libexo/trunk/exo-open/main.c	2009-05-11 19:19:51 UTC (rev 29941)
+++ libexo/trunk/exo-open/main.c	2009-05-11 19:42:21 UTC (rev 29942)
@@ -110,6 +110,7 @@
   g_option_context_set_help_enabled (context, FALSE);
   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
   g_option_context_add_group (context, gtk_get_option_group (TRUE));
+  g_option_context_set_ignore_unknown_options (context, TRUE);
   if (!g_option_context_parse (context, &argc, &argv, &err))
     {
       g_fprintf (stderr, "exo-open: %s.\n", err->message);