Removed "Subscribe" and "Unsubscribe" buttons. Fixes #331509.

svn path=/trunk/; revision=32398

3 files changed, 13 insertions, 215 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 55e115d59e..793a5bca8d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2006-07-24  Sushma Rai  <rsushma@novell.com>
+
+	* em-subscribe-editor.c (_EMSubscribeEditor): Removed the members 
+	subscribe_button and unsubscribe_button.
+	(sub_do_subscribe)(sub_subscribe)(sub_editor_subscribe)
+	(sub_editor_unsubscribe): Removed.
+	(sub_selection_changed)(em_subscribe_editor_new): Removed the handling
+	for the subscribe and unsubscribe buttons.
+
+	* mail-dialogs.glade: Removed "Subscribe" and "Unsubscribe" buttons.
+	Fixes #331509.
+
 2006-07-22  Yuri Pankov <yuri.pankov@gmail.com>
 
 	Reviewed by Harish Krishnaswamy <kharish@novell.com>
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index dda439d358..4aa6842102 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -75,8 +75,6 @@ struct _EMSubscribeEditor {
 	GtkWidget *optionmenu;
 	GtkWidget *none_selected; /* 'please select a xxx' message */
 	GtkWidget *none_selected_item;
-	GtkWidget *subscribe_button;
-	GtkWidget *unsubscribe_button;
 	GtkWidget *progress;
 };
 
@@ -429,35 +427,6 @@ sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node)
 /* ********************************************************************** */
 
 /* (un) subscribes the current selection */
-static void sub_do_subscribe(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, void *data)
-{
-	EMSubscribe *sub = data;
-	EMSubscribeNode *node;
-	gboolean subscribed;
-
-	gtk_tree_model_get(model, iter, 0, &subscribed, 2, &node, -1);
-	if (sub->subscribed_state ^ subscribed) {
-		char *spath;
-
-		spath = gtk_tree_path_to_string(path);
-		gtk_tree_store_set((GtkTreeStore *)model, iter, 0, subscribed, -1);
-		sub_subscribe_folder(sub, node, sub->subscribed_state, spath);
-		g_free(spath);
-	}
-}
-
-static void
-sub_subscribe(EMSubscribe *sub, gboolean subscribed)
-{
-	GtkTreeSelection *selection;
-
-	if (sub->tree == NULL)
-		return;
-
-	sub->subscribed_state = subscribed;
-	selection = gtk_tree_view_get_selection (sub->tree);
-	gtk_tree_selection_selected_foreach(selection, sub_do_subscribe, sub);
-}
 
 static void
 sub_subscribe_toggled(GtkCellRendererToggle *render, const char *spath, EMSubscribe *sub)
@@ -508,8 +477,6 @@ sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub)
 	else if (sub->selected_subscribed_count == 0)
 		dounsub = FALSE;
 
-	gtk_widget_set_sensitive(sub->editor->subscribe_button, dosub);
-	gtk_widget_set_sensitive(sub->editor->unsubscribe_button, dounsub);
 }
 
 /* double-clicking causes a node item to be evaluated directly */
@@ -722,24 +689,6 @@ sub_editor_refresh(GtkWidget *w, EMSubscribeEditor *se)
 }
 
 static void
-sub_editor_subscribe(GtkWidget *w, EMSubscribeEditor *se)
-{
-	d(printf("subscribe clicked, current = %p\n", se->current));
-
-	if (se->current)
-		sub_subscribe(se->current, TRUE);
-}
-
-static void
-sub_editor_unsubscribe(GtkWidget *w, EMSubscribeEditor *se)
-{
-	d(printf("unsubscribe clicked\n"));
-
-	if (se->current)
-		sub_subscribe(se->current, FALSE);
-}
-
-static void
 sub_editor_got_store(char *uri, CamelStore *store, void *data)
 {
 	struct _EMSubscribe *sub = data;
@@ -861,11 +810,6 @@ GtkDialog *em_subscribe_editor_new(void)
 
 	se->vbox = glade_xml_get_widget(xml, "tree_box");
 
-	se->subscribe_button = glade_xml_get_widget (xml, "subscribe_button");
-	g_signal_connect(se->subscribe_button, "clicked", G_CALLBACK(sub_editor_subscribe), se);
-	se->unsubscribe_button = glade_xml_get_widget (xml, "unsubscribe_button");
-	g_signal_connect(se->unsubscribe_button, "clicked", G_CALLBACK(sub_editor_unsubscribe), se);
-
 	/* FIXME: This is just to get the shadow, is there a better way? */
 	w = gtk_label_new(_("Please select a server."));
 	se->none_selected = gtk_viewport_new(NULL, NULL);
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index 45677b6ffe..398875ff3c 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -698,165 +698,7 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkVButtonBox" id="vbuttonbox1">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_START</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkButton" id="subscribe_button">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment1">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox3">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image1">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-add</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Subscribe</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="unsubscribe_button">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment2">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox4">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image2">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-remove</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Unsubscribe</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		  <property name="pack_type">GTK_PACK_END</property>
-		</packing>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>