From 310100f70e6fb88323f07cdf16bb1e01254c7c7c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 13 Jun 2005 12:44:09 +0000
Subject: [PATCH] conenct the signals in glade instead of in the code

---
 src/groupchat_window.py | 17 -----------------
 src/gtkgui.glade        |  6 ++++++
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index ec0587d6b..fa5e4f8f7 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -681,23 +681,6 @@ class GroupchatWindow(chat.Chat):
 		xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_actions_menu', APP)
 		self.gc_actions_menu = xm.get_widget('gc_actions_menu')
 
-		configure_menuitem, change_subject_menuitem, bookmark_room_menuitem = self.gc_actions_menu.get_children()
-
-		configure_menuitem.connect('activate',
-			self.on_configure_room_menuitem_activate)
-		change_subject_menuitem.connect('activate',
-			self.on_change_subject_menuitem_activate)
-		bookmark_room_menuitem.connect('activate',
-			self.on_bookmark_room_menuitem_activate)
-
-		# connect the buttons to their respective functions
-		actions_button = self.xmls[room_jid].get_widget(
-			'actions_button')
-		actions_button.connect('clicked', self.on_actions_button_clicked)
-		send_button = self.xmls[room_jid].get_widget(
-			'send_button')
-		send_button.connect('clicked', self.on_send_button_clicked)
-		
 		#status_image, nickname, real_jid, show
 		store = gtk.TreeStore(gtk.Image, str, str, str)
 		store.set_sort_column_id(1, gtk.SORT_ASCENDING)
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 8b55fad49..dbee114b6 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8624,6 +8624,7 @@ Custom</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_actions_button_clicked" last_modification_time="Mon, 13 Jun 2005 11:03:39 GMT"/>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment76">
@@ -8698,6 +8699,7 @@ Custom</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_history_button_clicked" last_modification_time="Mon, 13 Jun 2005 10:57:54 GMT"/>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment75">
@@ -8783,6 +8785,7 @@ Custom</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
+			  <signal name="clicked" handler="on_send_button_clicked" last_modification_time="Mon, 13 Jun 2005 11:04:33 GMT"/>
 
 			  <child>
 			    <widget class="GtkAlignment" id="alignment74">
@@ -15206,6 +15209,7 @@ the Jabber network.</property>
       <property name="visible">True</property>
       <property name="label" translatable="yes">Configure _Room</property>
       <property name="use_underline">True</property>
+      <signal name="activate" handler="on_configure_room_menuitem_activate" last_modification_time="Mon, 13 Jun 2005 11:04:55 GMT"/>
 
       <child internal-child="image">
 	<widget class="GtkImage" id="image684">
@@ -15226,6 +15230,7 @@ the Jabber network.</property>
       <property name="visible">True</property>
       <property name="label" translatable="yes">Change _Subject</property>
       <property name="use_underline">True</property>
+      <signal name="activate" handler="on_change_subject_menuitem_activate" last_modification_time="Mon, 13 Jun 2005 11:05:10 GMT"/>
 
       <child internal-child="image">
 	<widget class="GtkImage" id="image685">
@@ -15246,6 +15251,7 @@ the Jabber network.</property>
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Bookmark This Room</property>
       <property name="use_underline">True</property>
+      <signal name="activate" handler="on_bookmark_room_menuitem_activate" last_modification_time="Mon, 13 Jun 2005 12:43:29 GMT"/>
 
       <child internal-child="image">
 	<widget class="GtkImage" id="image686">