gthumb r2487 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Mon Jan  5 14:48:59 2009
New Revision: 2487
URL: http://svn.gnome.org/viewvc/gthumb?rev=2487&view=rev

Log:
2009-01-05  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/file-utils.c: (dir_make), (dir_remove):
        * libgthumb/gconf-utils.c: (eel_gconf_set_string_list),
        (eel_gconf_get_string_list):
        * src/dlg-web-exporter.c: (theme_dialog__go_to_folder_clicked):
        Add "=NULL" to "GError *error" declarations to initialize properly.
        Expanded version of patch by Christophe BisiÃre. Bug #566421.

        * libgthumb/gth-utils.c: (gthumb_display_help):
        Reformat the GError initialization in the more usual form.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/file-utils.c
   trunk/libgthumb/gconf-utils.c
   trunk/libgthumb/gth-utils.c
   trunk/src/dlg-web-exporter.c

Modified: trunk/libgthumb/file-utils.c
==============================================================================
--- trunk/libgthumb/file-utils.c	(original)
+++ trunk/libgthumb/file-utils.c	Mon Jan  5 14:48:59 2009
@@ -361,7 +361,7 @@
 {
         GFile    *gfile;
         gboolean  result;
-	GError   *error;
+	GError   *error = NULL;
 
         gfile = gfile_new (path);
         result = g_file_make_directory (gfile, NULL, &error);
@@ -381,10 +381,10 @@
 {
 	GFile    *gfile;
 	gboolean  result;
-	GError   *error;
+	GError   *error = NULL;
 	
 	gfile = gfile_new (path);
-	result = g_file_delete (gfile, NULL, NULL);
+	result = g_file_delete (gfile, NULL, &error);
 
 	if (error != NULL) {
                 gfile_warning ("Could not remove directory", gfile, error);

Modified: trunk/libgthumb/gconf-utils.c
==============================================================================
--- trunk/libgthumb/gconf-utils.c	(original)
+++ trunk/libgthumb/gconf-utils.c	Mon Jan  5 14:48:59 2009
@@ -370,7 +370,7 @@
 			   const GSList *slist)
 {
 	GConfClient *client;
-	GError *error;
+	GError *error = NULL;
 
 	g_return_if_fail (key != NULL);
 
@@ -391,7 +391,7 @@
 {
 	GSList *slist;
 	GConfClient *client;
-	GError *error;
+	GError *error = NULL;
 	
 	g_return_val_if_fail (key != NULL, NULL);
 	

Modified: trunk/libgthumb/gth-utils.c
==============================================================================
--- trunk/libgthumb/gth-utils.c	(original)
+++ trunk/libgthumb/gth-utils.c	Mon Jan  5 14:48:59 2009
@@ -30,9 +30,8 @@
 gthumb_display_help (GtkWindow  *window,
 	             const char *section)
 {
-	GError *err;
+	GError *err = NULL;
 
-	err = NULL;  
 	gnome_help_display ("gthumb", section, &err);
 
 	if (err != NULL) {

Modified: trunk/src/dlg-web-exporter.c
==============================================================================
--- trunk/src/dlg-web-exporter.c	(original)
+++ trunk/src/dlg-web-exporter.c	Mon Jan  5 14:48:59 2009
@@ -845,7 +845,7 @@
 				    ThemeDialogData *tdata)
 {
 	char         *path;
-	GError       *err;
+	GError       *err = NULL;
 
 	path = g_strdup_printf ("file://%s/.gnome2/gthumb/albumthemes",
 			       g_get_home_dir ());