balsa r8094 - in trunk: . libbalsa src

[PeterB svn gnome org]

Author: PeterB
Date: Tue Mar  3 23:02:50 2009
New Revision: 8094
URL: http://svn.gnome.org/viewvc/balsa?rev=8094&view=rev

Log:
GError cleanup

Modified:
   trunk/ChangeLog
   trunk/libbalsa/gmime-stream-gio.c
   trunk/libbalsa/libbalsa-conf.c
   trunk/libbalsa/mailbox_local.c
   trunk/libbalsa/source-viewer.c
   trunk/src/ab-main.c
   trunk/src/balsa-icons.c
   trunk/src/filter-edit-callbacks.c
   trunk/src/filter-run-callbacks.c
   trunk/src/main-window.c
   trunk/src/main.c
   trunk/src/message-window.c
   trunk/src/sendmsg-window.c

Modified: trunk/libbalsa/gmime-stream-gio.c
==============================================================================
--- trunk/libbalsa/gmime-stream-gio.c	(original)
+++ trunk/libbalsa/gmime-stream-gio.c	Tue Mar  3 23:02:50 2009
@@ -71,8 +71,7 @@
 	    g_debug("%s::%s::%d " textmsg ": err %d: %s\n",		\
 		    __FILE__, __FUNCTION__, __LINE__,			\
 		    gioerr->code, gioerr->message);			\
-	    g_error_free(gioerr);					\
-	    gioerr = NULL;						\
+	    g_clear_error(&gioerr);					\
 	}								\
     } while(0)
 #else

Modified: trunk/libbalsa/libbalsa-conf.c
==============================================================================
--- trunk/libbalsa/libbalsa-conf.c	(original)
+++ trunk/libbalsa/libbalsa-conf.c	Tue Mar  3 23:02:50 2009
@@ -81,7 +81,7 @@
          const gchar * old_dir)
 {
     struct stat buf;
-    GError *error;
+    GError *error = NULL;
 
     if (!conf->path)
         conf->path =
@@ -97,7 +97,6 @@
     conf->new_path = g_strconcat(conf->path, ".new", NULL);
 #endif                          /* !GLIB_CHECK_VERSION(2, 7, 0) */
     libbalsa_assure_balsa_dir();
-    error = NULL;
     if (!g_key_file_load_from_file
         (conf->key_file, conf->path, G_KEY_FILE_NONE, &error)) {
         gchar *old_path;
@@ -110,8 +109,7 @@
         g_message("Could not load config from \"%s\":\n %s\n"
                   " trying \"%s\"", conf->path, error->message, old_path);
 #endif                          /* DEBUG */
-        g_error_free(error);
-        error = NULL;
+        g_clear_error(&error);
 
         buf = lbc_readfile(old_path);
         if (buf) {
@@ -130,20 +128,15 @@
                       old_path,
                       error ? error->message : g_strerror(errno));
 #endif                          /* DEBUG */
-            if (error) {
-                g_error_free(error);
-                error = NULL;
-            }
+            g_clear_error(&error);
             warn = FALSE;
         }
         g_free(old_path);
-        if (warn) {
+        if (warn)
             libbalsa_information(LIBBALSA_INFORMATION_WARNING,
                                  _("Your Balsa configuration "
                                    "is now stored in "
                                    "\"~/.balsa/config\"."));
-            warn = FALSE;
-        }
     }
 }
 
@@ -502,7 +495,7 @@
     gchar **groups;
     gchar *buf;
     gsize len;
-    GError *error;
+    GError *error = NULL;
 #if !GLIB_CHECK_VERSION(2, 7, 0)
     gint fd;
 #endif                          /* !GLIB_CHECK_VERSION(2, 7, 0) */
@@ -519,7 +512,6 @@
     }
     g_strfreev(groups);
 
-    error = NULL;
     buf = g_key_file_to_data(conf->key_file, &len, &error);
     if (error) {
 #if DEBUG

Modified: trunk/libbalsa/mailbox_local.c
==============================================================================
--- trunk/libbalsa/mailbox_local.c	(original)
+++ trunk/libbalsa/mailbox_local.c	Tue Mar  3 23:02:50 2009
@@ -515,7 +515,7 @@
     gchar *filename;
     LibBalsaMailboxLocalSaveTreeInfo save_info;
 #if GLIB_CHECK_VERSION(2, 8, 0)
-    GError *err;
+    GError *err = NULL;
 #else                           /* GLIB_CHECK_VERSION(2, 8, 0) */
     gchar *template;
 #endif                          /* GLIB_CHECK_VERSION(2, 8, 0) */
@@ -564,7 +564,6 @@
                     &save_info);
 
 #if GLIB_CHECK_VERSION(2, 8, 0)
-    err = NULL;
     if (!g_file_set_contents(filename, save_info.array->data,
                              save_info.array->len *
                              sizeof(LibBalsaMailboxLocalTreeInfo), &err)) {

Modified: trunk/libbalsa/source-viewer.c
==============================================================================
--- trunk/libbalsa/source-viewer.c	(original)
+++ trunk/libbalsa/source-viewer.c	Tue Mar  3 23:02:50 2009
@@ -197,7 +197,7 @@
     GtkActionGroup *action_group;
     GtkUIManager *ui_manager;
     GtkAccelGroup *accel_group;
-    GError *error;
+    GError *error = NULL;
 
     window = GTK_WIDGET(app);
 
@@ -216,7 +216,6 @@
     accel_group = gtk_ui_manager_get_accel_group(ui_manager);
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 
-    error = NULL;
     if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_description,
                                            -1, &error)) {
         g_message("building menus failed: %s", error->message);

Modified: trunk/src/ab-main.c
==============================================================================
--- trunk/src/ab-main.c	(original)
+++ trunk/src/ab-main.c	Tue Mar  3 23:02:50 2009
@@ -626,7 +626,7 @@
     GtkActionGroup *action_group;
     GtkUIManager *ui_manager;
     GtkAccelGroup *accel_group;
-    GError *error;
+    GError *error = NULL;
     GList *ab;
 #if HAVE_MACOSX_DESKTOP
     IgeMacMenuGroup *group;
@@ -644,7 +644,6 @@
     accel_group = gtk_ui_manager_get_accel_group(ui_manager);
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 
-    error = NULL;
     if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_description,
                                            -1, &error)) {
         g_message("building menus failed: %s", error->message);
@@ -1112,9 +1111,6 @@
 #if HAVE_GNOME
     GnomeClient *client;
 #endif
-#ifdef GTKHTML_HAVE_GCONF
-    GError *gconf_error;
-#endif
 
 #ifdef ENABLE_NLS
     /* Initialize the i18n stuff */
@@ -1140,9 +1136,7 @@
 #endif
 
 #ifdef GTKHTML_HAVE_GCONF
-    if (!gconf_init(argc, argv, &gconf_error))
-	g_error_free(gconf_error);
-    gconf_error = NULL;
+    gconf_init(argc, argv, NULL);
 #endif
 
     bab_init();

Modified: trunk/src/balsa-icons.c
==============================================================================
--- trunk/src/balsa-icons.c	(original)
+++ trunk/src/balsa-icons.c	Tue Mar  3 23:02:50 2009
@@ -143,8 +143,7 @@
 	    if (!pixbuf) {
 		BICONS_ERR("additional size %d failed: %s", width,
 			   error->message);
-		g_error_free(error);
-		error = NULL;
+		g_clear_error(&error);
 	    } else {
 		GtkIconSource *icon_source = gtk_icon_source_new();
 		

Modified: trunk/src/filter-edit-callbacks.c
==============================================================================
--- trunk/src/filter-edit-callbacks.c	(original)
+++ trunk/src/filter-edit-callbacks.c	Tue Mar  3 23:02:50 2009
@@ -823,7 +823,7 @@
 {
     LibBalsaCondition *new_cnd;
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-    GError *err;
+    GError *err = NULL;
 #endif
 
     switch (response) {
@@ -881,7 +881,6 @@
         break;
     case GTK_RESPONSE_HELP:     /* Help button */
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-	err = NULL;
 #if GTK_CHECK_VERSION(2, 14, 0)
         gtk_show_uri(NULL, "ghelp:balsa?win-condition",
                      gtk_get_current_event_time(), &err);
@@ -1452,7 +1451,7 @@
     GtkTreeIter iter;
     gboolean valid;
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-    GError *err;
+    GError *err = NULL;
 #endif
     
     switch (response) {
@@ -1493,7 +1492,6 @@
 
     case GTK_RESPONSE_HELP:     /* Help button */
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-	err = NULL;
 #if GTK_CHECK_VERSION(2, 14, 0)
         gtk_show_uri(NULL, "ghelp:balsa?win-filters",
                      gtk_get_current_event_time(), &err);

Modified: trunk/src/filter-run-callbacks.c
==============================================================================
--- trunk/src/filter-run-callbacks.c	(original)
+++ trunk/src/filter-run-callbacks.c	Tue Mar  3 23:02:50 2009
@@ -168,7 +168,7 @@
 {
     BalsaFilterRunDialog * p;
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-    GError *err;
+    GError *err = NULL;
 #endif
 
     p=BALSA_FILTER_RUN_DIALOG(widget);
@@ -185,7 +185,6 @@
 	break;
     case GTK_RESPONSE_HELP:     /* Help button */
 #if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
-	err = NULL;
 #if GTK_CHECK_VERSION(2, 14, 0)
         gtk_show_uri(NULL, "ghelp:balsa?win-run-filters",
                      gtk_get_current_event_time(), &err);

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Tue Mar  3 23:02:50 2009
@@ -1559,7 +1559,7 @@
     BalsaToolbarModel *model;
     GtkUIManager *ui_manager;
     GtkAccelGroup *accel_group;
-    GError *error;
+    GError *error = NULL;
     GtkWidget *menubar;
     GtkWidget *toolbar;
     GtkWidget *hbox;
@@ -1591,7 +1591,6 @@
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
     g_object_unref(accel_group);
 
-    error = NULL;
     if (!gtk_ui_manager_add_ui_from_string
         (ui_manager, ui_description, -1, &error)) {
         g_message("building menus failed: %s", error->message);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Mar  3 23:02:50 2009
@@ -754,9 +754,6 @@
     GnomeClient *client;
 #endif
     gchar *default_icon;
-#ifdef GTKHTML_HAVE_GCONF
-    GError *gconf_error;
-#endif
 
 #ifdef ENABLE_NLS
     /* Initialize the i18n stuff */
@@ -805,9 +802,7 @@
     balsa_init(argc, argv);
 
 #ifdef GTKHTML_HAVE_GCONF
-    if (!gconf_init(argc, argv, &gconf_error))
-	g_error_free(gconf_error);
-    gconf_error = NULL;
+    gconf_init(argc, argv, NULL);
 #endif
 
     balsa_app_init();

Modified: trunk/src/message-window.c
==============================================================================
--- trunk/src/message-window.c	(original)
+++ trunk/src/message-window.c	Tue Mar  3 23:02:50 2009
@@ -524,7 +524,7 @@
     BalsaToolbarModel *model;
     GtkUIManager *ui_manager;
     GtkAccelGroup *accel_group; 
-    GError *error;
+    GError *error = NULL;
     GtkWidget *menubar;
     GtkWidget *toolbar;
     GtkWidget *move_menu, *submenu;
@@ -562,7 +562,6 @@
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
     g_object_unref(accel_group);
 
-    error = NULL;
     if (!gtk_ui_manager_add_ui_from_string
         (ui_manager, ui_description, -1, &error)) {
         g_message("building menus failed: %s", error->message);

Modified: trunk/src/sendmsg-window.c
==============================================================================
--- trunk/src/sendmsg-window.c	(original)
+++ trunk/src/sendmsg-window.c	Tue Mar  3 23:02:50 2009
@@ -4529,7 +4529,7 @@
 #endif                          /* HAVE_GTKSOURCEVIEW */
     GtkUIManager *ui_manager;
     GtkAccelGroup *accel_group;
-    GError *error;
+    GError *error = NULL;
     GtkWidget *menubar;
 
     bsmsg = g_malloc(sizeof(BalsaSendmsg));
@@ -4586,7 +4586,6 @@
     gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
     g_object_unref(accel_group);
 
-    error = NULL;
     if (!gtk_ui_manager_add_ui_from_string
         (ui_manager, ui_description, -1, &error)) {
         g_message("building menus failed: %s", error->message);