Don't pass NULL for %s to g_message(). (main): Drop unnecessary call to

2008-03-20  Tor Lillqvist  <tml@novell.com>

	* tests/testfilechooserbutton.c (chooser_update_preview_cb): Don't
	pass NULL for %s to g_message().
	(main): Drop unnecessary call to gtk_widget_destroy().

svn path=/trunk/; revision=19908

diff --git a/ChangeLog b/ChangeLog
index 8ee0c5c110835d8366ee8e6ab8f908dcee311bfb..855c6c13609497818fff953fba2c2f1629d18bb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-20  Tor Lillqvist  <tml@novell.com>
+
+       * tests/testfilechooserbutton.c (chooser_update_preview_cb): Don't
+       pass NULL for %s to g_message().
+       (main): Drop unnecessary call to gtk_widget_destroy().
+
 2008-03-20  Tor Lillqvist  <tml@novell.com>
 
        Bug 314084 - GTK+ dialogs should not be placed partially offscreen

diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 11d7fea78c6c7fef9c4d07b4e29a166e9187c078..f1c1ed336088ddd9b23ddc5826f1fe666e6fd40e 100644 (file)
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -237,9 +237,12 @@ chooser_update_preview_cb (GtkFileChooser *chooser,
   gchar *filename;
 
   filename = gtk_file_chooser_get_preview_uri (chooser);
-  g_message ("%s::update-preview\n\tPreview Filename: `%s'\nDone.\n",
-            G_OBJECT_TYPE_NAME (chooser), filename);
-  g_free (filename);
+  if (filename != NULL)
+    {
+      g_message ("%s::update-preview\n\tPreview Filename: `%s'\nDone.\n",
+                G_OBJECT_TYPE_NAME (chooser), filename);
+      g_free (filename);
+    }
 }
 
 
@@ -358,7 +361,5 @@ main (int   argc,
 
   gtk_main ();
 
-  gtk_widget_destroy (win);
-
   return 0;
 }