Use explicit boolean expressions for if-conditionals, according to Telepathy style.

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 851aa5313128f5af6c464ab6fdb291ee8319ade9..99dd077fec2ed17c32a347dbb221390e64ad6333 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -577,12 +577,12 @@ contact_widget_cell_toggled (GtkCellRendererToggle *cell,
   gtk_list_store_set (store, &iter, COL_ENABLED, !enabled, -1);
   gtk_tree_path_free (path);
 
-  if (group)
+  if (group != NULL)
     {
       FolksIndividual *individual = folks_individual_from_empathy_contact (
           information->contact);
 
-      if (individual)
+      if (individual != NULL)
         {
           folks_groups_change_group (FOLKS_GROUPS (individual), group, !enabled);
           g_object_unref (individual);
@@ -810,7 +810,7 @@ contact_widget_button_group_clicked_cb (GtkButton *button,
 
   individual = folks_individual_from_empathy_contact (information->contact);
 
-  if (individual)
+  if (individual != NULL)
     {
       folks_groups_change_group (FOLKS_GROUPS (individual), group, TRUE);
       g_object_unref (individual);
@@ -1339,7 +1339,7 @@ contact_widget_entry_alias_focus_event_cb (GtkEditable *editable,
           FolksIndividual *individual = folks_individual_from_empathy_contact (
               information->contact);
 
-          if (individual)
+          if (individual != NULL)
             {
               folks_alias_set_alias (FOLKS_ALIAS (individual), alias);
               g_object_unref (individual);
@@ -1537,7 +1537,7 @@ contact_widget_contact_update (EmpathyContactWidget *information)
           FolksIndividual *individual = folks_individual_from_empathy_contact (
               information->contact);
 
-          if (individual)
+          if (individual != NULL)
             {
               gboolean is_favourite = folks_favourite_get_is_favourite (
                   FOLKS_FAVOURITE (individual));
@@ -1674,7 +1674,7 @@ favourite_toggled_cb (GtkToggleButton *button,
   FolksIndividual *individual = folks_individual_from_empathy_contact (
       information->contact);
 
-  if (individual)
+  if (individual != NULL)
     {
       gboolean active = gtk_toggle_button_get_active (button);
       folks_favourite_set_is_favourite (FOLKS_FAVOURITE (individual), active);

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index b47b310cc8db07bd7f8e5948217b17ab07a07f31..87fa80083b036f1d41f08e3d86706dbd743bb47b 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -269,7 +269,7 @@ individual_store_find_contact_foreach (GtkTreeModel *model,
       fc->iters = g_list_append (fc->iters, gtk_tree_iter_copy (iter));
     }
 
-  if (individual)
+  if (individual != NULL)
     {
       g_object_unref (individual);
     }

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 43d4a785646be85dd10eea9a7f8e23827afc3151..dc90990189aab83286c378fc7d69a9c2014eb92d 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -899,7 +899,7 @@ individual_view_row_activated (GtkTreeView *view,
 
   contact = empathy_contact_from_folks_individual (individual);
 
-  if (contact)
+  if (contact != NULL)
     {
       DEBUG ("Starting a chat");
 
@@ -1985,7 +1985,7 @@ individual_view_group_remove_activate_cb (GtkMenuItem *menuitem,
   gchar *group;
 
   group = empathy_individual_view_get_selected_group (view, NULL);
-  if (group)
+  if (group != NULL)
     {
       gchar *text;
       GtkWindow *parent;
@@ -2073,7 +2073,7 @@ individual_view_remove_activate_cb (GtkMenuItem *menuitem,
 
   individual = empathy_individual_view_dup_selected (view);
 
-  if (individual)
+  if (individual != NULL)
     {
       gchar *text;
       GtkWindow *parent;

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index f6fe0c9b4836586e8d74872d62555c838dc1cb36..58ace96d1b896bd4484af51c0958a1b0a017ac40 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -189,7 +189,7 @@ main_window_flash_foreach (GtkTreeModel *model,
 
        contact = empathy_contact_from_folks_individual (individual);
        if (contact != data->event->contact) {
-               if (contact) {
+               if (contact != NULL) {
                        g_object_unref (contact);
                }
                return FALSE;
@@ -221,7 +221,7 @@ main_window_flash_foreach (GtkTreeModel *model,
        }
 
        g_object_unref (individual);
-       if (contact)
+       if (contact != NULL)
                g_object_unref (contact);
 
        return FALSE;
@@ -355,7 +355,7 @@ main_window_row_activated_cb (EmpathyContactListView *view,
 
        g_object_unref (contact);
 OUT:
-       if (individual)
+       if (individual != NULL)
                g_object_unref (individual);
 }