From 65bf3f42d6699ce32edccab2412dabe195eac68d Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Mon, 7 Feb 2011 10:59:33 +1100
Subject: Add blocked contacts dialog to Empathy main window menu

---
 src/empathy-main-window.c  | 17 ++++++++++++++++-
 src/empathy-main-window.ui |  7 +++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'src')

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>
@@ -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,
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
@@ -106,6 +106,12 @@
             <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>
@@ -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>
-- 
cgit v1.2.3


From 8e95ee8c1455390b18126d2280bcd218777379a8 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Thu, 10 Feb 2011 13:19:35 +1100
Subject: Add a confirmation dialog when you block a contact from the Contact
 menu

---
 src/empathy-chat-window.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 799a8254d..73856adde 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -417,12 +417,15 @@ chat_window_contact_menu_update (EmpathyChatWindowPriv *priv,
 
 	if (orig_submenu == NULL || !gtk_widget_get_visible (orig_submenu)) {
 		submenu = empathy_chat_get_contact_menu (priv->current_chat);
+
+		/* gtk_menu_attach_to_widget() doesn't behave nicely here */
+		g_object_set_data (G_OBJECT (submenu), "window", priv->dialog);
+
 		if (submenu != NULL) {
 			gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
 			gtk_widget_show (menu);
 			gtk_widget_set_sensitive (menu, TRUE);
-		}
-		else {
+		} else {
 			gtk_widget_set_sensitive (menu, FALSE);
 		}
 	} else {
-- 
cgit v1.2.3


From dfbccc45923082027415c3c76322febf470c5901 Mon Sep 17 00:00:00 2001
From: Chandni Verma <chandniverma2112@gmail.com>
Date: Fri, 11 Mar 2011 07:50:51 +0530
Subject: Setting "window" data on submenu only if it's not NULL

---
 src/empathy-chat-window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 73856adde..23c93a15b 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -418,10 +418,10 @@ chat_window_contact_menu_update (EmpathyChatWindowPriv *priv,
 	if (orig_submenu == NULL || !gtk_widget_get_visible (orig_submenu)) {
 		submenu = empathy_chat_get_contact_menu (priv->current_chat);
 
-		/* gtk_menu_attach_to_widget() doesn't behave nicely here */
-		g_object_set_data (G_OBJECT (submenu), "window", priv->dialog);
-
 		if (submenu != NULL) {
+			/* gtk_menu_attach_to_widget() doesn't behave nicely here */
+			g_object_set_data (G_OBJECT (submenu), "window", priv->dialog);
+
 			gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
 			gtk_widget_show (menu);
 			gtk_widget_set_sensitive (menu, TRUE);
-- 
cgit v1.2.3