diff options
| author | Chandni Verma <chandniverma2112@gmail.com> | 2011-03-08 16:06:05 +0800 |
|---|---|---|
| committer | Chandni Verma <chandniverma2112@gmail.com> | 2011-03-09 09:49:19 +0800 |
| commit | 81ba0edc73b6a226a054b76539645b7b4e5e2a99 (patch) | |
| tree | 10c83abc415c266b5fc58020f5da3492d7ab54f6 /libempathy-gtk | |
| parent | 3ff78cbfcfe5dd8cbda7263764d3a8d93995bc20 (diff) | |
| download | gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar.gz gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar.bz2 gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar.lz gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar.xz gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.tar.zst gsoc2013-empathy-81ba0edc73b6a226a054b76539645b7b4e5e2a99.zip | |
Use Contact Manager flags instead of Individual Manager flags
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-dialogs.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 75e69709a..1d3fcb8e2 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -33,6 +33,7 @@ #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-utils.h> +#include <libempathy/empathy-contact-manager.h> #include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" @@ -168,8 +169,8 @@ empathy_block_individual_dialog_show (GtkWindow *parent, FolksIndividual *individual, gboolean *abusive) { - EmpathyIndividualManager *manager = - empathy_individual_manager_dup_singleton (); + EmpathyContactManager *contact_manager = + empathy_contact_manager_dup_singleton (); GtkWidget *dialog; GtkWidget *abusive_check = NULL; GList *personas, *l; @@ -190,18 +191,18 @@ empathy_block_individual_dialog_show (GtkWindow *parent, { TpfPersona *persona = l->data; TpContact *contact; - EmpathyIndividualManagerFlags flags; + EmpathyContactListFlags flags; if (!TPF_IS_PERSONA (persona)) continue; contact = tpf_persona_get_contact (persona); - flags = empathy_individual_manager_get_flags_for_connection (manager, - tp_contact_get_connection (contact)); + flags = empathy_contact_manager_get_flags_for_connection ( + contact_manager, tp_contact_get_connection (contact)); - if (!(flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_BLOCK)) + if (!(flags & EMPATHY_CONTACT_LIST_CAN_BLOCK)) continue; - else if (flags & EMPATHY_INDIVIDUAL_MANAGER_CAN_REPORT_ABUSIVE) + else if (flags & EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE) can_report_abuse = TRUE; g_string_append_printf (str, "\n " BULLET_POINT " %s", @@ -235,7 +236,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent, gtk_widget_show (abusive_check); } - g_object_unref (manager); + g_object_unref (contact_manager); g_string_free (str, TRUE); res = gtk_dialog_run (GTK_DIALOG (dialog)); |