# HG changeset patch
# User Eric Polino <aluink@pidgin.im>
# Date 1181685684 0
# Node ID a1ac8b05ecdb8f65369218a774971de4749a82c9
# Parent  ac904659104fa75f50dafe7ee0f5b1033568a57e
Fixed a few problems that were created by the merge from the propagate.

diff -r ac904659104f -r a1ac8b05ecdb finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Tue Jun 12 21:21:37 2007 +0000
+++ b/finch/libgnt/gntwm.c	Tue Jun 12 22:01:24 2007 +0000
@@ -498,35 +498,6 @@
 	return TRUE;
 }
 
-static gboolean
-help_for_widget(GntBindable *bindable, GList *null)
-{
-	GntWM *wm = GNT_WM(bindable);
-	GntWidget *widget, *tree, *win, *active;
-	char *title;
-
-	if (!wm->cws->ordered)
-		return TRUE;
-
-	widget = wm->cws->ordered->data;
-	if (!GNT_IS_BOX(widget))
-		return TRUE;
-	active = GNT_BOX(widget)->active;
-
-	tree = gnt_widget_bindings_view(active);
-	win = gnt_window_new();
-	title = g_strdup_printf("Bindings for %s", g_type_name(G_OBJECT_TYPE(active)));
-	gnt_box_set_title(GNT_BOX(win), title);
-	if (tree)
-		gnt_box_add_widget(GNT_BOX(win), tree);
-	else
-		gnt_box_add_widget(GNT_BOX(win), gnt_label_new("This widget has no customizable bindings."));
-
-	gnt_widget_show(win);
-
-	return TRUE;
-}
-
 static void
 destroy__list(GntWidget *widget, GntWM *wm)
 {
@@ -1175,7 +1146,7 @@
 help_for_window(GntBindable *bindable, GList *null)
 {
 	GntWM *wm = GNT_WM(bindable);
-	GntWidget *widget = wm->ordered->data;
+	GntWidget *widget = wm->cws->ordered->data;
 
 	return help_for_bindable(wm,GNT_BINDABLE(widget));
 }
@@ -1186,10 +1157,10 @@
 	GntWM *wm = GNT_WM(bindable);
 	GntWidget *widget;
 
-	if (!wm->ordered)
+	if (!wm->cws->ordered)
 		return TRUE;
 
-	widget = wm->ordered->data;
+	widget = wm->cws->ordered->data;
 	if (!GNT_IS_BOX(widget))
 		return TRUE;