soylent r82 - trunk/src

[treitter svn gnome org]

Author: treitter
Date: Thu Feb 14 06:47:06 2008
New Revision: 82
URL: http://svn.gnome.org/viewvc/soylent?rev=82&view=rev

Log:
always use g_clear_error() instead of g_error_free() to avoid extra if wrappers

Modified:
   trunk/src/soylent-browser-eds.c
   trunk/src/soylent-browser-person-view.c
   trunk/src/soylent-browser.c

Modified: trunk/src/soylent-browser-eds.c
==============================================================================
--- trunk/src/soylent-browser-eds.c	(original)
+++ trunk/src/soylent-browser-eds.c	Thu Feb 14 06:47:06 2008
@@ -584,7 +584,7 @@
   else
     {
       g_critical ("Could not load system addressbook: %s", error->message);
-      g_error_free (error);
+      g_clear_error (&error);
     }
 
   return retval;

Modified: trunk/src/soylent-browser-person-view.c
==============================================================================
--- trunk/src/soylent-browser-person-view.c	(original)
+++ trunk/src/soylent-browser-person-view.c	Thu Feb 14 06:47:06 2008
@@ -192,10 +192,7 @@
               retval = FALSE;
             } 
 
-          if (error)
-            {
-              g_error_free (error);
-            }
+          g_clear_error (&error);
           g_free (e_uid);
         }
       else
@@ -323,7 +320,7 @@
               {
                 g_warning ("Failed to launch Contacts to edit this person: %s",
                            error->message);
-                g_error_free (error);
+                g_clear_error (&error);
               }
             else
               {
@@ -633,8 +630,8 @@
     if (error_add)
       {
         g_warning ("Failed to launch Contacts to add a new Person: %s",
-                    error_add->message);
-        g_error_free (error_add);
+                   error_add->message);
+        g_clear_error (&error_add);
       }
     else
       {
@@ -669,9 +666,8 @@
 
     if (!e_book_add_contact (e_book, e_contact, &error_add))
       {
-        g_warning ("Failed to create a new contact: %s",
-                    error_add->message);
-        g_error_free (error_add);
+        g_warning ("Failed to create a new contact: %s", error_add->message);
+        g_clear_error (&error_add);
       }
     else
       {
@@ -1211,7 +1207,7 @@
                     {
                       g_warning ("Failed to open email window to %s: %s",
                                 email_addr, error->message);
-                      g_error_free (error);
+                      g_clear_error (&error);
                     }
 
                   g_free (mailto);

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Thu Feb 14 06:47:06 2008
@@ -767,10 +767,9 @@
                         }
                       else
                         {
-                          g_warning ("query to addressbook for username "
-                                    "'%s' failed: %s", live_name,
-                                    error->message);
-                          g_error_free (error);
+                          g_warning ("query to addressbook for username '%s' "
+                                     "failed: %s", live_name, error->message);
+                          g_clear_error (&error);
                         }
                     }
                 }