diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-dialogs.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-contact-dialogs.h b/libempathy-gtk/empathy-contact-dialogs.h index 5e881ab73..21aa5ce73 100644 --- a/libempathy-gtk/empathy-contact-dialogs.h +++ b/libempathy-gtk/empathy-contact-dialogs.h @@ -35,9 +35,6 @@ void empathy_contact_information_dialog_show (EmpathyContact *contact, void empathy_contact_edit_dialog_show (EmpathyContact *contact, GtkWindow *parent); void empathy_contact_personal_dialog_show (GtkWindow *parent); - GtkWindow *parent, - gboolean edit, - gboolean is_user); void empathy_new_contact_dialog_show (GtkWindow *parent); void empathy_new_contact_dialog_show_with_contact (GtkWindow *parent, EmpathyContact *contact); diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 5e52fe351..c1c46b3ca 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -559,7 +559,7 @@ tp_contact_list_get_requestablechannelclasses_cb (TpProxy *connection, handle_type = tp_asv_get_uint32 (props, TP_IFACE_CHANNEL ".TargetHandleType", NULL); - if (!strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) && + if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) && handle_type == TP_HANDLE_TYPE_GROUP) { DEBUG ("Got channel class for a contact group"); priv->flags |= EMPATHY_CONTACT_LIST_CAN_GROUP; @@ -782,7 +782,7 @@ tp_contact_list_constructed (GObject *list) priv->factory = empathy_tp_contact_factory_dup_singleton (priv->connection); - /* call GetAliasFlags() */ + /* call GetAliasFlags */ if (tp_proxy_has_interface_by_id (priv->connection, TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING)) { tp_cli_connection_interface_aliasing_call_get_alias_flags ( |