rpms/bluez-gnome/devel bluez-gnome-remove-class.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 bluez-gnome.spec, 1.24, 1.25 sources, 1.9, 1.10 bluez-gnome-0.14-disable-class-selection-with-hal.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10288

Modified Files:
	.cvsignore bluez-gnome.spec sources 
Added Files:
	bluez-gnome-remove-class.patch 
Removed Files:
	bluez-gnome-0.14-disable-class-selection-with-hal.patch 
Log Message:
* Wed Jan 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.15-1
- Update to 0.15
- Add patch to remove the useless hardware type selection


bluez-gnome-remove-class.patch:

--- NEW FILE bluez-gnome-remove-class.patch ---
Index: applet/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/applet/main.c,v
retrieving revision 1.95
diff -u -p -r1.95 main.c
--- applet/main.c	22 Dec 2007 00:09:15 -0000	1.95
+++ applet/main.c	16 Jan 2008 12:56:41 -0000
@@ -1271,7 +1271,10 @@ static char *get_form_factor(void)
 	libhal_ctx_shutdown(ctx, NULL);
 	libhal_ctx_free(ctx);
 
-	if (strcmp(formfactor, "laptop") && strcmp(formfactor, "desktop")) {
+	if (strcmp(formfactor, "laptop")
+	    && strcmp(formfactor, "desktop")
+	    && strcmp (formfactor, "server")
+	    && strcmp (formfactor, "handheld")) {
 		/* We don't know anything else */
 		g_free(formfactor);
 		formfactor = g_strdup("uncategorized");
Index: properties/adapter.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/adapter.c,v
retrieving revision 1.17
diff -u -p -r1.17 adapter.c
--- properties/adapter.c	29 Aug 2007 15:41:49 -0000	1.17
+++ properties/adapter.c	16 Jan 2008 12:56:41 -0000
@@ -208,36 +208,6 @@ static gboolean focus_callback(GtkWidget
 	return FALSE;
 }
 
-static void class_callback(GtkWidget *combobox, gpointer user_data)
-{
-	struct adapter_data *adapter = user_data;
-	const char *minor;
-	gint index;
-	DBusGProxy *object;
-
-	index = gtk_combo_box_get_active(GTK_COMBO_BOX(combobox));
-
-	switch (index) {
-	case 0:
-		minor = "uncategorized";
-		break;
-	case 1:
-		minor = "desktop";
-		break;
-	case 2:
-		minor = "laptop";
-		break;
-	default:
-		return;
-	}
-
-	object = dbus_g_proxy_new_for_name(connection, "org.bluez",
-					adapter->path, "org.bluez.Adapter");
-
-	dbus_g_proxy_call(object, "SetMinorClass", NULL,
-			G_TYPE_STRING, minor, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
 static void update_buttons(struct adapter_data *adapter, gboolean bonded,
 					gboolean trusted, gboolean connected)
 {
@@ -523,7 +493,6 @@ static void create_adapter(struct adapte
 	GtkWidget *button;
 	GtkWidget *scale;
 	GtkWidget *entry;
-	GtkWidget *combobox;
 	GtkWidget *buttonbox;
 	GtkWidget *scrolled;
 	GtkWidget *tree;
@@ -531,7 +500,6 @@ static void create_adapter(struct adapte
 	GtkTreeSelection *selection;
 	GSList *group = NULL;
 	gdouble value;
-	gint index;
 
 	object = dbus_g_proxy_new_for_name(connection, "org.bluez",
 					adapter->path, "org.bluez.Adapter");
@@ -695,37 +663,6 @@ static void create_adapter(struct adapte
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
 
-	label = create_label(_("Class of device"));
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-
-	combobox = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-						_("Unspecified"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-						_("Desktop workstation"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-						_("Laptop computer"));
-	gtk_box_pack_start(GTK_BOX(vbox), combobox, FALSE, FALSE, 0);
-
-	if (major && minor && g_ascii_strcasecmp(major, "computer") == 0) {
-		if (g_ascii_strcasecmp(minor, "uncategorized") == 0)
-			index = 0;
-		else if (g_ascii_strcasecmp(minor, "desktop") == 0)
-			index = 1;
-		else if (g_ascii_strcasecmp(minor, "laptop") == 0)
-			index = 2;
-		else
-			index = -1;
-
-		gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
-	} else
-		gtk_widget_set_sensitive(GTK_WIDGET(combobox), FALSE);
-
-	adapter->combo = combobox;
-
-	g_signal_connect(G_OBJECT(combobox), "changed",
-					G_CALLBACK(class_callback), adapter);
-
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
 
Index: properties/general.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/general.c,v
retrieving revision 1.2
diff -u -p -r1.2 general.c
--- properties/general.c	29 Jul 2007 11:28:48 -0000	1.2
+++ properties/general.c	16 Jan 2008 12:56:41 -0000
@@ -116,17 +116,6 @@ static void autoauth_callback(GtkWidget 
 	gconf_client_set_bool(gconf, PREF_AUTO_AUTHORIZE, value, NULL);
 }
 
-#ifdef HAVE_HAL
-static void usehal_callback(GtkWidget *button, gpointer user_data)
-{
-	gboolean value;
-
-	value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
-
-	gconf_client_set_bool(gconf, PREF_USE_HAL, value, NULL);
-}
-#endif
-
 GtkWidget *create_label(const gchar *str)
 {
 	GtkWidget *label;
@@ -172,22 +161,6 @@ GtkWidget *create_general(void)
 	g_signal_connect(G_OBJECT(button_autoauth), "toggled",
 					G_CALLBACK(autoauth_callback), NULL);
 
-#ifdef HAVE_HAL
-	vbox = gtk_vbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-
-	label = create_label(_("Hardware database"));
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-
-	button_usehal = gtk_check_button_new_with_label(
-				_("Select class of device automatically"));
-	value = gconf_client_get_bool(gconf, PREF_USE_HAL, NULL);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button_usehal), value);
-	gtk_box_pack_start(GTK_BOX(vbox), button_usehal, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(button_usehal), "toggled",
-					G_CALLBACK(usehal_callback), NULL);
-#endif
-
 	vbox = gtk_vbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Aug 2007 14:08:17 -0000	1.9
+++ .cvsignore	16 Jan 2008 13:17:04 -0000	1.10
@@ -1 +1 @@
-bluez-gnome-0.14.tar.gz
+bluez-gnome-0.15.tar.gz


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bluez-gnome.spec	23 Oct 2007 04:46:11 -0000	1.24
+++ bluez-gnome.spec	16 Jan 2008 13:17:04 -0000	1.25
@@ -1,13 +1,13 @@
 Name:		bluez-gnome
-Version:	0.14
-Release:	9%{?dist}
+Version:	0.15
+Release:	1%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://www.bluez.org/
 Source0:	http://bluez.sf.net/download/%{name}-%{version}.tar.gz
-Patch1:		bluez-gnome-0.14-disable-class-selection-with-hal.patch
+Patch1:		bluez-gnome-remove-class.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,9 +43,7 @@
 
 %prep
 %setup -q
-pushd properties
-%patch1 -p0 -b .use-hal
-popd
+%patch1 -p0 -b .remove-class
 
 %build
 %configure --disable-mime-update --disable-desktop-update
@@ -125,6 +123,10 @@
 %{_datadir}/man/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Wed Jan 16 2008 - Bastien Nocera <bnocera at redhat.com> - 0.15-1
+- Update to 0.15
+- Add patch to remove the useless hardware type selection
+
 * Tue Oct 23 2007 Matthias Clasen <mclasen at redhat.com> - 0.14-9
 - Rebuild against new dbus-glib
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Aug 2007 14:08:17 -0000	1.9
+++ sources	16 Jan 2008 13:17:04 -0000	1.10
@@ -1 +1 @@
-7c4106e6932683c12c1e30bfb166c13d  bluez-gnome-0.14.tar.gz
+c1fef5de75cc4f9bdb1a21541ecb0f39  bluez-gnome-0.15.tar.gz


--- bluez-gnome-0.14-disable-class-selection-with-hal.patch DELETED ---