aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-07-08 10:22:15 +0800
committerTravis Reitter <treitter@gmail.com>2010-07-21 07:12:36 +0800
commit7473d7a97d02be9aeefa271269184485ddf460a4 (patch)
tree28947f297e03ec2a0098b72e373381e65163f6de
parenta854cb126541cda286f4f48d2962c43e3be8a4f5 (diff)
downloadgsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar.gz
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar.bz2
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar.lz
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar.xz
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.tar.zst
gsoc2013-empathy-7473d7a97d02be9aeefa271269184485ddf460a4.zip
Use explicit boolean expressions for if-conditionals, according to Telepathy style.
-rw-r--r--libempathy-gtk/empathy-contact-widget.c12
-rw-r--r--libempathy-gtk/empathy-individual-store.c2
-rw-r--r--libempathy-gtk/empathy-individual-view.c6
-rw-r--r--src/empathy-main-window.c6
4 files changed, 13 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 851aa5313..99dd077fe 100644
--- 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 b47b310cc..87fa80083 100644
--- 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 43d4a7856..dc9099018 100644
--- 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 f6fe0c9b4..58ace96d1 100644
--- 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);
}