rpms/bluez-gnome/FC-6 bluez-gnome-0.6-multiple-adaptors.patch, NONE, 1.1 bluez-gnome-0.6-tab-size.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bluez-gnome.spec, 1.1, 1.2 sources, 1.2, 1.3 bluez-gnome-0.5-discoverable.patch, 1.1, NONE bluez-gnome-0.5-exestack.patch, 1.1, NONE bluez-gnome-0.5-owner_changed.patch, 1.1, NONE bluez-gnome-0.5-visibility-gconf.patch, 1.1, NONE bluez-gnome-0.5-visibility.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 25 22:46:32 UTC 2006
Author: dwmw2
Update of /cvs/dist/rpms/bluez-gnome/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv31139
Modified Files:
.cvsignore bluez-gnome.spec sources
Added Files:
bluez-gnome-0.6-multiple-adaptors.patch
bluez-gnome-0.6-tab-size.patch
Removed Files:
bluez-gnome-0.5-discoverable.patch
bluez-gnome-0.5-exestack.patch
bluez-gnome-0.5-owner_changed.patch
bluez-gnome-0.5-visibility-gconf.patch
bluez-gnome-0.5-visibility.patch
Log Message:
bluez-gnome-0.6-1
bluez-gnome-0.6-multiple-adaptors.patch:
main.c | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
--- NEW FILE bluez-gnome-0.6-multiple-adaptors.patch ---
Index: properties/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- properties/main.c 25 Oct 2006 12:23:11 -0000 1.14
+++ properties/main.c 25 Oct 2006 14:45:56 -0000 1.15
@@ -287,7 +287,7 @@ static GList *adapter_list = NULL;
struct adapter_data {
char *path;
int attached;
- gint page;
+ GtkWidget *child;
GtkWidget *button_connect;
GtkWidget *button_visible;
GtkWidget *timeout_label;
@@ -459,7 +459,7 @@ static void create_adapter(struct adapte
gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
- adapter->page = gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), vbox, NULL);
+ gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), vbox, NULL);
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), vbox,
name && strlen(name) > 0 ? name : _("Adapter"));
@@ -470,6 +470,8 @@ static void create_adapter(struct adapte
gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
+ adapter->child = vbox;
+
label = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(label), _("<b>Mode of operation</b>"));
@@ -638,13 +640,18 @@ static void adapter_free(gpointer data,
static void adapter_disable(gpointer data, gpointer user_data)
{
struct adapter_data *adapter = data;
+ gint page;
adapter->attached = 0;
- if (adapter->page >= 0)
- gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), adapter->page);
+ if (adapter->child != NULL) {
+ page = gtk_notebook_page_num(GTK_NOTEBOOK(notebook),
+ adapter->child);
- adapter->page = -1;
+ gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page);
+ }
+
+ adapter->child = NULL;
}
static gint adapter_compare(gconstpointer a, gconstpointer b)
@@ -732,15 +739,12 @@ static void name_changed(DBusGProxy *obj
list = g_list_find_custom(adapter_list, path, adapter_compare);
if (list && list->data) {
struct adapter_data *adapter = list->data;
- GtkWidget *child;
+ GtkWidget *child = adapter->child;
GtkWidget *label;
if (!adapter->attached)
return;
- child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
- adapter->page);
-
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), child,
name && strlen(name) > 0 ? name : _("Adapter"));
@@ -855,12 +859,16 @@ static void adapter_removed(DBusGProxy *
list = g_list_find_custom(adapter_list, path, adapter_compare);
if (list && list->data) {
struct adapter_data *adapter = list->data;
+ gint page;
adapter->attached = 0;
- gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), adapter->page);
+ page = gtk_notebook_page_num(GTK_NOTEBOOK(notebook),
+ adapter->child);
+
+ gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page);
- adapter->page = -1;
+ adapter->child = NULL;
}
}
bluez-gnome-0.6-tab-size.patch:
main.c | 15 +++++++++++++++
1 files changed, 15 insertions(+)
--- NEW FILE bluez-gnome-0.6-tab-size.patch ---
Index: properties/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- properties/main.c 22 Oct 2006 11:30:34 -0000 1.12
+++ properties/main.c 23 Oct 2006 09:08:23 -0000 1.13
@@ -418,6 +418,12 @@ static void create_adapter(struct adapte
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), vbox,
name && strlen(name) > 0 ? name : _("Adapter"));
+ label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(notebook), vbox);
+
+ gtk_label_set_max_width_chars(GTK_LABEL(label), 20);
+
+ gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
+
label = gtk_label_new(NULL);
gtk_label_set_markup(GTK_LABEL(label), _("<b>Mode of operation</b>"));
@@ -518,6 +524,8 @@ static void create_adapter(struct adapte
entry = gtk_entry_new();
+ gtk_entry_set_max_length(GTK_ENTRY(entry), 248);
+
if (name != NULL)
gtk_entry_set_text(GTK_ENTRY(entry), name);
@@ -679,6 +687,7 @@ static void name_changed(DBusGProxy *obj
if (list && list->data) {
struct adapter_data *adapter = list->data;
GtkWidget *child;
+ GtkWidget *label;
if (!adapter->attached)
return;
@@ -689,6 +698,12 @@ static void name_changed(DBusGProxy *obj
gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook), child,
name && strlen(name) > 0 ? name : _("Adapter"));
+ label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(notebook), child);
+
+ gtk_label_set_max_width_chars(GTK_LABEL(label), 20);
+
+ gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
+
gtk_entry_set_text(GTK_ENTRY(adapter->entry), name ? name : "");
adapter->name_changed = 0;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/bluez-gnome/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Oct 2006 11:58:26 -0000 1.2
+++ .cvsignore 25 Oct 2006 22:46:30 -0000 1.3
@@ -1 +1 @@
-bluez-gnome-0.5.tar.gz
+bluez-gnome-0.6.tar.gz
Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-gnome/FC-6/bluez-gnome.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bluez-gnome.spec 18 Oct 2006 11:58:26 -0000 1.1
+++ bluez-gnome.spec 25 Oct 2006 22:46:30 -0000 1.2
@@ -1,17 +1,15 @@
Name: bluez-gnome
-Version: 0.5
-Release: 5%{?dist}
+Version: 0.6
+Release: 1%{?dist}
Summary: Bluetooth pairing and control applet
Group: Applications/System
License: GPL
URL: http://www.bluez.org/
Source0: http://bluez.sf.net/download/%{name}-%{version}.tar.gz
-Patch1: bluez-gnome-0.5-visibility.patch
-Patch2: bluez-gnome-0.5-exestack.patch
-Patch3: bluez-gnome-0.5-visibility-gconf.patch
-Patch4: bluez-gnome-0.5-owner_changed.patch
-Patch5: bluez-gnome-0.5-discoverable.patch
+Patch0: bluez-gnome-0.6-tab-size.patch
+Patch1: bluez-gnome-0.6-multiple-adaptors.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: s390 s390x
@@ -26,12 +24,9 @@
%prep
%setup -q
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-sed -i /^OnlyShowIn=/d applet/bt-applet.desktop
+%patch0 -p0
+%patch1 -p0
+sed -i /^OnlyShowIn=/d applet/bluetooth-applet.desktop
%build
%configure
@@ -49,12 +44,15 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*
-%{_sysconfdir}/xdg/autostart/bt-applet.desktop
+%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+%{_datadir}/applications/bluetooth-properties.desktop
%doc README COPYING AUTHORS ChangeLog
-
%changelog
+* Thu Oct 26 2006 David Woodhouse <dwmw2 at redhat.com> 0.6-1
+- Update to bluez-gnome 0.6
+
* Fri Oct 6 2006 David Woodhouse <dwmw2 at redhat.com> 0.5-5
- Allow user to toggle discoverability
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/bluez-gnome/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 18 Oct 2006 11:58:26 -0000 1.2
+++ sources 25 Oct 2006 22:46:30 -0000 1.3
@@ -1 +1 @@
-fbb04989c550bfbcf284d1744ff23f6a bluez-gnome-0.5.tar.gz
+54334e3d7af70846eb4916191e46081c bluez-gnome-0.6.tar.gz
--- bluez-gnome-0.5-discoverable.patch DELETED ---
--- bluez-gnome-0.5-exestack.patch DELETED ---
--- bluez-gnome-0.5-owner_changed.patch DELETED ---
--- bluez-gnome-0.5-visibility-gconf.patch DELETED ---
--- bluez-gnome-0.5-visibility.patch DELETED ---
More information about the fedora-cvs-commits
mailing list