[PATCH] Make bluetooth-properties fit on smaller displays

[<Mario_Limonciello@xxxxxxxx>]

Hi:

Ubuntu was carrying a "hildon" patch to make the bluetooth-properties application fit on smaller form factors for lpia.  We've adapted the patch to be applicable to all platforms.  It changes the layout of the bluetooth-properties window to be better for small displays without a loss of functionality.

Regards

Mario Limonciello 
Dell | Linux Engineering 
Mario_Limonciello@xxxxxxxx 

diff -Nur -x '*.orig' -x '*~' bluez-gnome-1.5/properties/adapter.c bluez-gnome-1.5.new/properties/adapter.c
--- bluez-gnome-1.5/properties/adapter.c	2008-09-28 11:47:41.000000000 -0500
+++ bluez-gnome-1.5.new/properties/adapter.c	2008-09-28 11:47:51.000000000 -0500
@@ -208,11 +208,7 @@
 	}
 
 	update_buttons(adapter, paired, trusted, connected);
-
-	if (selected == TRUE)
-		gtk_widget_show(adapter->button_trusted);
-	else
-		gtk_widget_hide(adapter->button_trusted);
+	gtk_widget_set_sensitive(adapter->button_trusted, selected);
 }
 
 static void row_callback(GtkTreeModel *model, GtkTreePath  *path,
@@ -379,7 +375,7 @@
 		timeout = 0;
 	}
 
-	mainbox = gtk_vbox_new(FALSE, 18);
+	mainbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_set_border_width(GTK_CONTAINER(mainbox), 12);
 
 	gtk_notebook_prepend_page(GTK_NOTEBOOK(adapter->notebook),
@@ -389,6 +385,9 @@
 
 	adapter->child = mainbox;
 
+	mainbox = gtk_vbox_new (FALSE, 18);
+	gtk_container_add(GTK_CONTAINER (GTK_CONTAINER (adapter->child)), mainbox);
+
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
 
@@ -489,7 +488,7 @@
 					G_CALLBACK(focus_callback), adapter);
 
 	vbox = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(adapter->child), vbox, TRUE, TRUE, 0);
 
 	label = create_label(_("Known devices"));
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
@@ -535,9 +534,9 @@
 	adapter->button_delete = button;
 
 	button = gtk_button_new_with_mnemonic(NULL);
-	gtk_widget_set_no_show_all(button, TRUE);
 	gtk_container_add(GTK_CONTAINER(buttonbox), button);
-
+	gtk_button_set_label(GTK_BUTTON(button),_("Set _Trusted"));
+	gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 	g_signal_connect(G_OBJECT(button), "clicked",
 				G_CALLBACK(trusted_callback), adapter);