Kill some obsolete utility functions.

2 files changed, 6 insertions, 203 deletions

diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index d33e3c1139..0974081f78 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -29,19 +29,13 @@
 #include "e-gui-utils.h"
 
 void
-e_auto_kill_popup_menu_on_selection_done (GtkMenu *menu)
-{
-	g_return_if_fail (GTK_IS_MENU (menu));
-
-	g_signal_connect (menu, "selection_done", G_CALLBACK (gtk_widget_destroy), menu);
-}
-
-void
 e_popup_menu (GtkMenu *menu, GdkEvent *event)
 {
 	g_return_if_fail (GTK_IS_MENU (menu));
 
-	e_auto_kill_popup_menu_on_selection_done (menu);
+	g_signal_connect (
+		menu, "selection-done",
+		G_CALLBACK (gtk_widget_destroy), NULL);
 
 	if (event) {
 		if (event->type == GDK_KEY_PRESS)
@@ -59,174 +53,3 @@ e_popup_menu (GtkMenu *menu, GdkEvent *event)
 		gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0,
 				GDK_CURRENT_TIME);
 }
-
-typedef struct {
-	GtkCallback callback;
-	gpointer closure;
-} CallbackClosure;
-
-static void
-e_container_foreach_leaf_callback(GtkWidget *widget, CallbackClosure *callback_closure)
-{
-	if (GTK_IS_CONTAINER(widget)) {
-		e_container_foreach_leaf(GTK_CONTAINER(widget), callback_closure->callback, callback_closure->closure);
-	} else {
-		(*callback_closure->callback) (widget, callback_closure->closure);
-	}
-}
-
-void
-e_container_foreach_leaf(GtkContainer *container,
-			 GtkCallback callback,
-			 gpointer closure)
-{
-	CallbackClosure callback_closure;
-	callback_closure.callback = callback;
-	callback_closure.closure = closure;
-	gtk_container_foreach(container, (GtkCallback) e_container_foreach_leaf_callback, &callback_closure);
-}
-
-static void
-e_container_change_tab_order_destroy_notify(gpointer data)
-{
-	GList *list = data;
-	g_list_foreach(list, (GFunc) g_object_unref, NULL);
-	g_list_free(list);
-}
-
-static gint
-e_container_change_tab_order_callback(GtkContainer *container,
-				      GtkDirectionType direction,
-				      GList *children)
-{
-	GtkWidget *focus_child;
-	GtkWidget *child;
-
-	if (direction != GTK_DIR_TAB_FORWARD &&
-	    direction != GTK_DIR_TAB_BACKWARD)
-		return FALSE;
-
-	focus_child = container->focus_child;
-
-	if (focus_child == NULL)
-		return FALSE;
-
-	if (direction == GTK_DIR_TAB_BACKWARD) {
-		children = g_list_last(children);
-	}
-
-	while (children) {
-		child = children->data;
-		if (direction == GTK_DIR_TAB_FORWARD)
-			children = children->next;
-		else
-			children = children->prev;
-
-		if (!child)
-			continue;
-
-		if (focus_child) {
-			if (focus_child == child) {
-				focus_child = NULL;
-
-				if (GTK_WIDGET_DRAWABLE (child) &&
-				    GTK_IS_CONTAINER (child) &&
-				    !GTK_WIDGET_HAS_FOCUS (child))
-					if (gtk_widget_child_focus (GTK_WIDGET (child), direction)) {
-						g_signal_stop_emission_by_name (container, "focus");
-						return TRUE;
-					}
-			}
-		}
-		else if (GTK_WIDGET_DRAWABLE (child)) {
-			if (GTK_IS_CONTAINER (child)) {
-				if (gtk_widget_child_focus (GTK_WIDGET (child), direction)) {
-					g_signal_stop_emission_by_name (container, "focus");
-					return TRUE;
-				}
-			}
-			else if (GTK_WIDGET_CAN_FOCUS (child)) {
-				gtk_widget_grab_focus (child);
-				g_signal_stop_emission_by_name (container, "focus");
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-gint
-e_container_change_tab_order(GtkContainer *container, GList *widgets)
-{
-	GList *list;
-	list = g_list_copy(widgets);
-	g_list_foreach(list, (GFunc) g_object_ref, NULL);
-	return g_signal_connect_data (container, "focus",
-				      G_CALLBACK(e_container_change_tab_order_callback),
-				      list,
-				      (GClosureNotify) e_container_change_tab_order_destroy_notify,
-				      0);
-}
-
-struct widgetandint {
-	GtkWidget *widget;
-	gint count;
-};
-
-static void
-nth_entry_callback(GtkWidget *widget, struct widgetandint *data)
-{
-	if (GTK_IS_ENTRY(widget)) {
-		if (data->count > 1) {
-			data->count --;
-			data->widget = widget;
-		} else if (data->count == 1) {
-			data->count --;
-			data->widget = NULL;
-			gtk_widget_grab_focus(widget);
-		}
-	}
-}
-
-void
-e_container_focus_nth_entry(GtkContainer *container, gint n)
-{
-	struct widgetandint data;
-	data.widget = NULL;
-	data.count = n;
-	e_container_foreach_leaf(container, (GtkCallback) nth_entry_callback, &data);
-	if (data.widget)
-		gtk_widget_grab_focus(data.widget);
-}
-
-gboolean
-e_glade_xml_connect_widget (GladeXML *gui, gchar *name, gchar *signal, GCallback cb, gpointer closure)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget (gui, name);
-
-	if (widget) {
-		g_signal_connect (widget, signal,
-				  cb, closure);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-gboolean
-e_glade_xml_set_sensitive (GladeXML *gui, gchar *name, gboolean sensitive)
-{
-	GtkWidget *widget;
-
-	widget = glade_xml_get_widget (gui, name);
-
-	if (widget) {
-		gtk_widget_set_sensitive (widget, sensitive);
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
index b66160c2d1..ff05d57725 100644
--- a/widgets/misc/e-gui-utils.h
+++ b/widgets/misc/e-gui-utils.h
@@ -20,36 +20,16 @@
  *
  */
 
-#ifndef GAL_GUI_UTILS_H
-#define GAL_GUI_UTILS_H
+#ifndef E_GUI_UTILS_H
+#define E_GUI_UTILS_H
 
 #include <gtk/gtk.h>
-#include <glade/glade-xml.h>
 
 G_BEGIN_DECLS
 
 void  e_popup_menu                              (GtkMenu  *menu,
 						 GdkEvent *event);
-void  e_auto_kill_popup_menu_on_selection_done  (GtkMenu  *menu);
-
-void  e_container_foreach_leaf      (GtkContainer *container,
-				     GtkCallback   callback,
-				     gpointer      closure);
-void  e_container_focus_nth_entry   (GtkContainer *container,
-				     gint           n);
-gint  e_container_change_tab_order  (GtkContainer *container,
-				     GList        *widgets);
-
-/* Returns TRUE on success. */
-gboolean  e_glade_xml_connect_widget  (GladeXML      *gui,
-				       gchar          *name,
-				       gchar          *signal,
-				       GCallback      cb,
-				       gpointer       closure);
-gboolean  e_glade_xml_set_sensitive   (GladeXML      *gui,
-				       gchar          *name,
-				       gboolean       sensitive);
 
 G_END_DECLS
 
-#endif /* GAL_GUI_UTILS_H */
+#endif /* E_GUI_UTILS_H */