rpms/bluez-gnome/devel bluez-gnome-remove-class.patch, 1.4, 1.5 bluez-gnome.spec, 1.40, 1.41
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Fri Feb 15 18:02:31 UTC 2008
- Previous message (by thread): rpms/cobbler/devel sources,1.34,1.35
- Next message (by thread): rpms/python-igraph/devel python-igraph-authors.diff, NONE, 1.1 python-igraph-memory.diff, NONE, 1.1 python-igraph-parse.diff, NONE, 1.1 python-igraph.diffs, NONE, 1.1 python-igraph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9513
Modified Files:
bluez-gnome-remove-class.patch bluez-gnome.spec
Log Message:
* Fri Feb 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.21-2
- Update the patch to hide the "Class of device" selection widget,
avoids a crasher on startup with unstable releases of gnome-session
bluez-gnome-remove-class.patch:
Index: bluez-gnome-remove-class.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome-remove-class.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bluez-gnome-remove-class.patch 12 Feb 2008 00:17:01 -0000 1.4
+++ bluez-gnome-remove-class.patch 15 Feb 2008 18:02:23 -0000 1.5
@@ -1,143 +1,11 @@
-Index: properties/adapter.c
-===================================================================
-RCS file: /cvsroot/bluez/gnome/properties/adapter.c,v
-retrieving revision 1.22
-diff -u -p -r1.22 adapter.c
---- properties/adapter.c 11 Feb 2008 14:34:37 -0000 1.22
-+++ properties/adapter.c 12 Feb 2008 00:13:29 -0000
-@@ -212,42 +212,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;
-- case 3:
-- minor = "server";
-- break;
-- case 4:
-- minor = "handheld";
-- 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)
- {
-@@ -533,7 +497,6 @@ static void create_adapter(struct adapte
- GtkWidget *button;
- GtkWidget *scale;
- GtkWidget *entry;
-- GtkWidget *combobox;
- GtkWidget *buttonbox;
- GtkWidget *scrolled;
- GtkWidget *tree;
-@@ -541,7 +504,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");
-@@ -708,47 +670,6 @@ static void create_adapter(struct adapte
-
- adapter->class_box = vbox;
-
-- label = create_label(_("Class of device"));
-- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
--
-- adapter->class_label = label;
--
-- 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_combo_box_append_text(GTK_COMBO_BOX(combobox),
-- _("Server-class computer"));
-- gtk_combo_box_append_text(GTK_COMBO_BOX(combobox),
-- _("Handheld device"));
-- 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 if (g_ascii_strcasecmp(minor, "server") == 0)
-- index = 3;
-- else if (g_ascii_strcasecmp(minor, "handheld") == 0)
-- index = 4;
-- else
-- index = -1;
--
-- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
-- } else
-- gtk_widget_set_sensitive(GTK_WIDGET(combobox), FALSE);
--
-- adapter->class_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.7
diff -u -p -r1.7 general.c
--- properties/general.c 11 Feb 2008 16:05:17 -0000 1.7
-+++ properties/general.c 12 Feb 2008 00:13:29 -0000
-@@ -114,17 +114,6 @@ static void policy_callback(GtkWidget *b
- update_icon_policy(button);
- }
-
--#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
--
- static void autoauth_callback(GtkWidget *button, gpointer user_data)
- {
- gboolean value;
-@@ -219,27 +208,6 @@ GtkWidget *create_general(void)
++++ properties/general.c 15 Feb 2008 17:58:43 -0000
+@@ -219,26 +219,7 @@ GtkWidget *create_general(void)
g_signal_connect(G_OBJECT(button_autoauth), "toggled",
G_CALLBACK(autoauth_callback), NULL);
@@ -161,7 +29,7 @@
- else
- show_class_widget();
-#endif
--
++ hide_class_widget();
+
vbox = gtk_vbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(mainbox), vbox, FALSE, FALSE, 0);
-
Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bluez-gnome.spec 13 Feb 2008 10:11:56 -0000 1.40
+++ bluez-gnome.spec 15 Feb 2008 18:02:23 -0000 1.41
@@ -1,6 +1,6 @@
Name: bluez-gnome
Version: 0.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bluetooth pairing and control applet
Group: Applications/System
@@ -142,6 +142,10 @@
%{_datadir}/man/man1/bluetooth-analyzer.1.gz
%changelog
+* Fri Feb 15 2008 - Bastien Nocera <bnocera at redhat.com> - 0.21-2
+- Update the patch to hide the "Class of device" selection widget,
+ avoids a crasher on startup with unstable releases of gnome-session
+
* Wed Feb 13 2008 - Bastien Nocera <bnocera at redhat.com> - 0.21-1
- Update to 0.21
- Previous message (by thread): rpms/cobbler/devel sources,1.34,1.35
- Next message (by thread): rpms/python-igraph/devel python-igraph-authors.diff, NONE, 1.1 python-igraph-memory.diff, NONE, 1.1 python-igraph-parse.diff, NONE, 1.1 python-igraph.diffs, NONE, 1.1 python-igraph.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list