aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-12-12 17:40:28 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-12-12 17:40:28 +0800
commit590359196fe598b4ed6d1e6cd97395d181f51a4c (patch)
tree95a737af8646e36eb0a54fead298d4ad2228cc2d
parentc29b376f15e610018da2349b5f2a786df62d5737 (diff)
downloadgsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar.gz
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar.bz2
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar.lz
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar.xz
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.tar.zst
gsoc2013-empathy-590359196fe598b4ed6d1e6cd97395d181f51a4c.zip
Fix coding style
svn path=/trunk/; revision=1964
-rw-r--r--libempathy-gtk/empathy-contact-dialogs.c12
-rw-r--r--libempathy/empathy-contact-manager.c11
-rw-r--r--libempathy/empathy-contact-manager.h2
-rw-r--r--libempathy/empathy-tp-contact-list.c8
-rw-r--r--libempathy/empathy-tp-contact-list.h2
-rw-r--r--libempathy/empathy-tp-group.c12
-rw-r--r--libempathy/empathy-tp-group.h2
7 files changed, 25 insertions, 24 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index 49746bafc..692ca6430 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -239,14 +239,14 @@ static gboolean
can_add_contact_to_account (McAccount *account,
gpointer user_data)
{
- EmpathyContactManager *mgr;
- gboolean result;
+ EmpathyContactManager *mgr;
+ gboolean result;
- mgr = empathy_contact_manager_new ();
- result = empathy_contact_manager_can_add (mgr, account);
- g_object_unref (mgr);
+ mgr = empathy_contact_manager_new ();
+ result = empathy_contact_manager_can_add (mgr, account);
+ g_object_unref (mgr);
- return result;
+ return result;
}
static void
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 200f9ea37..d60e47b18 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -509,16 +509,17 @@ contact_manager_iface_init (EmpathyContactListIface *iface)
gboolean
empathy_contact_manager_can_add (EmpathyContactManager *manager,
- McAccount *account)
+ McAccount *account)
{
EmpathyContactManagerPriv *priv = GET_PRIV (manager);
- EmpathyTpContactList *list;
+ EmpathyTpContactList *list;
g_return_val_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager), FALSE);
- list = g_hash_table_lookup (priv->lists, account);
- if (list == NULL)
- return FALSE;
+ list = g_hash_table_lookup (priv->lists, account);
+ if (list == NULL)
+ return FALSE;
return empathy_tp_contact_list_can_add (list);
}
+
diff --git a/libempathy/empathy-contact-manager.h b/libempathy/empathy-contact-manager.h
index 80118a014..c2e0b67a2 100644
--- a/libempathy/empathy-contact-manager.h
+++ b/libempathy/empathy-contact-manager.h
@@ -55,7 +55,7 @@ GType empathy_contact_manager_get_type (void) G_GNUC_CONST;
EmpathyContactManager *empathy_contact_manager_new (void);
EmpathyTpContactList * empathy_contact_manager_get_list (EmpathyContactManager *manager,
McAccount *account);
-gboolean empathy_contact_manager_can_add (EmpathyContactManager *manager,
+gboolean empathy_contact_manager_can_add (EmpathyContactManager *manager,
McAccount *account);
G_END_DECLS
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 2013c60cf..719a6cc1a 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -1107,15 +1107,15 @@ gboolean
empathy_tp_contact_list_can_add (EmpathyTpContactList *list)
{
EmpathyTpContactListPriv *priv;
- TpChannelGroupFlags flags;
+ TpChannelGroupFlags flags;
g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list), FALSE);
priv = GET_PRIV (list);
- if (priv->subscribe == NULL)
- return FALSE;
+ if (priv->subscribe == NULL)
+ return FALSE;
- flags = empathy_tp_group_get_flags (priv->subscribe);
+ flags = empathy_tp_group_get_flags (priv->subscribe);
return (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD) != 0;
}
diff --git a/libempathy/empathy-tp-contact-list.h b/libempathy/empathy-tp-contact-list.h
index c6e173a93..e8edcface 100644
--- a/libempathy/empathy-tp-contact-list.h
+++ b/libempathy/empathy-tp-contact-list.h
@@ -51,7 +51,7 @@ struct _EmpathyTpContactListClass {
GType empathy_tp_contact_list_get_type (void) G_GNUC_CONST;
EmpathyTpContactList * empathy_tp_contact_list_new (McAccount *account);
McAccount * empathy_tp_contact_list_get_account (EmpathyTpContactList *list);
-gboolean empathy_tp_contact_list_can_add (EmpathyTpContactList *list);
+gboolean empathy_tp_contact_list_can_add (EmpathyTpContactList *list);
G_END_DECLS
diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index 689d2bb80..c9220382a 100644
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -24,10 +24,8 @@
#include <libmissioncontrol/mc-account.h>
-#include <telepathy-glib/channel.h>
#include <telepathy-glib/util.h>
#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/channel.h>
#include "empathy-tp-group.h"
#include "empathy-contact-factory.h"
@@ -972,10 +970,12 @@ empathy_tp_group_get_invitation (EmpathyTpGroup *group,
TpChannelGroupFlags
empathy_tp_group_get_flags (EmpathyTpGroup *self)
{
- EmpathyTpGroupPriv *priv = GET_PRIV (self);
+ EmpathyTpGroupPriv *priv = GET_PRIV (self);
- if (priv->channel == NULL)
- return 0;
+ g_return_val_if_fail (EMPATHY_IS_TP_GROUP (self), 0);
- return tp_channel_group_get_flags (priv->channel);
+ if (priv->channel == NULL)
+ return 0;
+
+ return tp_channel_group_get_flags (priv->channel);
}
diff --git a/libempathy/empathy-tp-group.h b/libempathy/empathy-tp-group.h
index 4a60bfc69..9e0dd53ef 100644
--- a/libempathy/empathy-tp-group.h
+++ b/libempathy/empathy-tp-group.h
@@ -86,7 +86,7 @@ EmpathyPendingInfo *empathy_pending_info_new (EmpathyContact *me
EmpathyContact *actor,
const gchar *message);
void empathy_pending_info_free (EmpathyPendingInfo *info);
-TpChannelGroupFlags empathy_tp_group_get_flags (EmpathyTpGroup *group);
+TpChannelGroupFlags empathy_tp_group_get_flags (EmpathyTpGroup *group);
G_END_DECLS