[cinnamon-control-center] enable bluetooth support
leigh123linux
leigh123linux at fedoraproject.org
Sun Jul 28 22:26:11 UTC 2013
commit e68d4b02736cee9784f2572d1b360c7cac22e103
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sun Jul 28 23:25:49 2013 +0100
enable bluetooth support
cinnamon-control-center.spec | 17 ++++++-
remove_obex.patch | 106 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 121 insertions(+), 2 deletions(-)
---
diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index 9696589..5bdfd75 100644
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -14,7 +14,7 @@
Summary: Utilities to configure the Cinnamon desktop
Name: cinnamon-control-center
Version: 1.9.0
-Release: 0.4.git%{_internal_version}%{?dist}
+Release: 0.5.git%{_internal_version}%{?dist}
# The following files contain code from
# ISC for panels/network/rfkill.h
# And MIT for wacom/calibrator/calibrator.c
@@ -30,6 +30,8 @@ URL: http://cinnamon.linuxmint.com
# wget https://github.com/linuxmint/cinnamon-control-center/tarball/%%{_internal_version} -O cinnamon-control-center-%%{version}.git%%{_internal_version}.tar.gz
Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-control-center/source/cinnamon-control-center-%{version}.git%{_internal_version}.tar.gz
+Patch0: remove_obex.patch
+
Requires: cinnamon-settings-daemon >= %{csd_version}
Requires: redhat-menus >= %{redhat_menus_version}
Requires: hicolor-icon-theme
@@ -94,6 +96,10 @@ BuildRequires: libpwquality-devel
BuildRequires: ibus-devel
BuildRequires: libgnomekbd-devel
BuildRequires: libxklavier-devel
+%ifnarch s390 s390x
+BuildRequires: gnome-bluetooth-libs-devel >= 2.91
+BuildRequires: gnome-bluetooth >= 2.91
+%endif
%description
This package contains configuration utilities for the Cinnamon desktop, which
@@ -125,6 +131,7 @@ utilities for testing Metacity/Muffin themes.
%prep
%setup -q -n linuxmint-%{name}-%{_internal_version}
+%patch0 -p1
autoreconf -fi
%build
@@ -133,7 +140,8 @@ autoreconf -fi
--disable-update-mimedb \
--with-libsocialweb=no \
--enable-systemd \
- --enable-ibus
+ --enable-ibus \
+ --enable-bluetooth
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
@@ -178,6 +186,7 @@ fi
%files -f %{gettext_package}.lang
%doc AUTHORS COPYING README
%{_datadir}/cinnamon-control-center/ui/
+%{_datadir}/cinnamon-control-center/bluetooth.ui
%{_datadir}/cinnamon-control-center/sounds/cinnamon-sounds-default.xml
%{_datadir}/applications/*.desktop
%{_datadir}/desktop-directories/*
@@ -191,6 +200,7 @@ fi
%config %{_sysconfdir}/xdg/menus/cinnamoncc.menu
%{_libdir}/libcinnamon-control-center.so.1*
%dir %{_libdir}/cinnamon-control-center-1/
+%{_libdir}/cinnamon-control-center-1/panels/libbluetooth.so
%{_libdir}/cinnamon-control-center-1/panels/libcolor.so
%{_libdir}/cinnamon-control-center-1/panels/libdisplay.so
%{_libdir}/cinnamon-control-center-1/panels/libnetwork.so
@@ -212,6 +222,9 @@ fi
%{_libdir}/pkgconfig/libcinnamon-control-center.pc
%changelog
+* Sun Jul 28 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.0-0.5.git7d365d0
+- enable bluetooth support
+
* Sat Jul 27 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.9.0-0.4.git7d365d0
- update to latest git
- fix icon name in color desktop file
diff --git a/remove_obex.patch b/remove_obex.patch
new file mode 100644
index 0000000..abcf1be
--- /dev/null
+++ b/remove_obex.patch
@@ -0,0 +1,106 @@
+--- a/panels/bluetooth/bluetooth.ui
++++ b/panels/bluetooth/bluetooth.ui
+@@ -543,34 +543,6 @@
+ <property name="position">3</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkBox" id="browse_box">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <child>
+- <placeholder/>
+- </child>
+- <child>
+- <object class="GtkButton" id="browse_button">
+- <property name="label" translatable="yes">Browse Files...</property>
+- <property name="can_focus">True</property>
+- <property name="receives_default">True</property>
+- <property name="use_action_appearance">False</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="pack_type">end</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">4</property>
+- </packing>
+- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+--- a/panels/bluetooth/cc-bluetooth-panel.c
++++ b/panels/bluetooth/cc-bluetooth-panel.c
+@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc
+ gtk_widget_hide (WID ("keyboard_box"));
+ gtk_widget_hide (WID ("sound_box"));
+ gtk_widget_hide (WID ("mouse_box"));
+- gtk_widget_hide (WID ("browse_box"));
+ gtk_widget_hide (WID ("send_box"));
+
+ bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
+@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc
+
+ uuids = (const char **) g_value_get_boxed (&value);
+ for (i = 0; uuids && uuids[i] != NULL; i++) {
+- if (g_str_equal (uuids[i], "OBEXObjectPush"))
++ if (g_str_equal (uuids[i], "OBEXObjectPush")) {
+ gtk_widget_show (WID ("send_box"));
+- else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
+- gtk_widget_show (WID ("browse_box"));
++ break;
++ }
+ }
+ g_value_unset (&value);
+ }
+@@ -538,34 +537,6 @@ send_callback (GtkButton *button,
+ g_free (alias);
+ }
+
+-static void
+-mount_finish_cb (GObject *source_object,
+- GAsyncResult *res,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+-
+- if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
+- g_printerr ("Failed to mount OBEX volume: %s", error->message);
+- g_error_free (error);
+- return;
+- }
+-}
+-
+-static void
+-browse_callback (GtkButton *button,
+- CcBluetoothPanel *self)
+-{
+- char *bdaddr;
+-
+- bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
+-
+- bluetooth_browse_address (G_OBJECT (self), bdaddr,
+- GDK_CURRENT_TIME, mount_finish_cb, NULL);
+-
+- g_free (bdaddr);
+-}
+-
+ /* Visibility/Discoverable */
+ static void discoverable_changed (BluetoothClient *client,
+ GParamSpec *spec,
+@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane
+ G_CALLBACK (keyboard_callback), self);
+ g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
+ G_CALLBACK (sound_callback), self);
+- g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
+- G_CALLBACK (browse_callback), self);
+ g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
+ G_CALLBACK (send_callback), self);
+ g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",
+
More information about the scm-commits
mailing list