aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-02-07 07:59:33 +0800
committerChandni Verma <chandniverma2112@gmail.com>2011-03-08 08:56:38 +0800
commit65bf3f42d6699ce32edccab2412dabe195eac68d (patch)
tree05917831c11731452986bfc1c3c4cc7b2ac5f054 /src
parentbf0586ea17afcd2ad04fefa24b8e74cd5e1f4b23 (diff)
downloadgsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar.gz
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar.bz2
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar.lz
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar.xz
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.tar.zst
gsoc2013-empathy-65bf3f42d6699ce32edccab2412dabe195eac68d.zip
Add blocked contacts dialog to Empathy main window menu
Diffstat (limited to 'src')
-rw-r--r--src/empathy-main-window.c17
-rw-r--r--src/empathy-main-window.ui7
2 files changed, 23 insertions, 1 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 8e3f2d89b..8c7642581 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -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>
@@ -1461,6 +1462,18 @@ main_window_edit_personal_information_cb (GtkAction *action,
}
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,
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 3c015392d..b32878bdc 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -107,6 +107,12 @@
</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>
<property name="name">edit_preferences</property>
@@ -249,6 +255,7 @@
<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>