]> git.0d.be Git - empathy.git/commitdiff
Add blocked contacts dialog to Empathy main window menu
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Sun, 6 Feb 2011 23:59:33 +0000 (10:59 +1100)
committerChandni Verma <chandniverma2112@gmail.com>
Tue, 8 Mar 2011 00:56:38 +0000 (06:26 +0530)
src/empathy-main-window.c
src/empathy-main-window.ui

index 8e3f2d89be7e34917cedd5e958c1c3d5e53b6d09..8c764258107d400ea4cedd35cb24ebb9cff4661d 100644 (file)
@@ -50,6 +50,7 @@
 #include <libempathy-gtk/empathy-contact-list-store.h>
 #include <libempathy-gtk/empathy-contact-list-view.h>
 #include <libempathy-gtk/empathy-live-search.h>
+#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
 #include <libempathy-gtk/empathy-contact-search-dialog.h>
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-gtk-enum-types.h>
@@ -1460,6 +1461,18 @@ main_window_edit_personal_information_cb (GtkAction         *action,
        empathy_contact_personal_dialog_show (GTK_WINDOW (window));
 }
 
+static void
+main_window_edit_blocked_contacts_cb (GtkAction         *action,
+                                     EmpathyMainWindow *window)
+{
+       GtkWidget *dialog;
+
+       dialog = empathy_contact_blocking_dialog_new (GTK_WINDOW (window));
+       gtk_widget_show (dialog);
+       g_signal_connect (dialog, "response",
+                       G_CALLBACK (gtk_widget_destroy), NULL);
+}
+
 static void
 main_window_edit_preferences_cb (GtkAction         *action,
                                 EmpathyMainWindow *window)
@@ -1619,7 +1632,8 @@ main_window_connection_items_setup (EmpathyMainWindow *window,
                "chat_new_message",
                "chat_new_call",
                "chat_add_contact",
-               "edit_personal_information"
+               "edit_personal_information",
+               "edit_blocked_contacts"
        };
 
        for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) {
@@ -1798,6 +1812,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
                              "edit", "activate", main_window_edit_cb,
                              "edit_accounts", "activate", main_window_edit_accounts_cb,
                              "edit_personal_information", "activate", main_window_edit_personal_information_cb,
+                             "edit_blocked_contacts", "activate", main_window_edit_blocked_contacts_cb,
                              "edit_preferences", "activate", main_window_edit_preferences_cb,
                              "edit_search_contacts", "activate", main_window_edit_search_contacts_cb,
                              "help_about", "activate", main_window_help_about_cb,
index 3c015392d39881c3c5e6522e59a858dfcef55a8d..b32878bdcc6d0269d63c814402bddc8e58060f81 100644 (file)
             <property name="label" translatable="yes">_Personal Information</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="edit_blocked_contacts">
+            <property name="name">edit_blocked_contacts</property>
+            <property name="label" translatable="yes">_Blocked Contacts</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="edit_preferences">
             <property name="stock_id">gtk-preferences</property>
           <menuitem action="edit_accounts"/>
           <menuitem action="edit_personal_information"/>
           <menuitem action="edit_search_contacts"/>
+          <menuitem action="edit_blocked_contacts"/>
           <separator/>
           <menuitem action="edit_preferences"/>
         </menu>