diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-accounts-dialog.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 9 |
3 files changed, 14 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2007-10-01 Xavier Claessens <xclaesse@gmail.com> + * libempathy-gtk/empathy-accounts-dialog.c: + * libempathy/empathy-utils.c: Add some sanity checks. Fixes bug #463051. + +2007-10-01 Xavier Claessens <xclaesse@gmail.com> + * libempathy/empathy-tp-chat.c: Disconnect all signals in finalize. Fixes bug #462815. diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c index e8a87d173..cc8ba4f45 100644 --- a/libempathy-gtk/empathy-accounts-dialog.c +++ b/libempathy-gtk/empathy-accounts-dialog.c @@ -700,7 +700,7 @@ accounts_dialog_status_changed_cb (MissionControl *mc, McPresence presence, TelepathyConnectionStatusReason reason, const gchar *unique_name, - EmpathyAccountsDialog *dialog) + EmpathyAccountsDialog *dialog) { GtkTreeView *view; GtkTreeSelection *selection; diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index e90521b05..e354e940d 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -369,16 +369,21 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, guint empathy_account_hash (gconstpointer key) { + g_return_val_if_fail (MC_IS_ACCOUNT (key), 0); + return g_str_hash (mc_account_get_unique_name (MC_ACCOUNT (key))); } gboolean empathy_account_equal (gconstpointer a, - gconstpointer b) + gconstpointer b) { const gchar *name_a; const gchar *name_b; + g_return_val_if_fail (MC_IS_ACCOUNT (a), FALSE); + g_return_val_if_fail (MC_IS_ACCOUNT (b), FALSE); + name_a = mc_account_get_unique_name (MC_ACCOUNT (a)); name_b = mc_account_get_unique_name (MC_ACCOUNT (b)); @@ -476,6 +481,8 @@ empathy_call_contact (EmpathyContact *contact) EmpathyTpGroup *group; GError *error; + g_return_if_fail (EMPATHY_IS_CONTACT (contact)); + /* StreamedMedia channels must have handle=0 and handle_type=none. * To call a contact we have to add him in the group interface of the * channel. MissionControl will detect the channel creation and |