cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FILE_SHARING_SCHEMA_ID -> FILE_SHARING_BLUETOOTH_SCHEMA_ID where needed.

Browse Source
This commit is contained in:
ajacoutot 2013-04-10 09:40:59 +00:00
parent f8627731c2
commit 481970e52a
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/controlcenter/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2013/04/06 08:16:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.93 2013/04/10 09:40:59 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.8.0
REVISION= 3
REVISION= 4
CATEGORIES= x11

33
x11/gnome/controlcenter/patches/patch-panels_sharing_cc-sharing-panel_c
View File

@ -1,19 +1,32 @@
$OpenBSD: patch-panels_sharing_cc-sharing-panel_c,v 1.1 2013/04/06 08:16:53 ajacoutot Exp $
$OpenBSD: patch-panels_sharing_cc-sharing-panel_c,v 1.2 2013/04/10 09:40:59 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=697413
--- panels/sharing/cc-sharing-panel.c.orig Sat Apr 6 10:02:08 2013
+++ panels/sharing/cc-sharing-panel.c Sat Apr 6 10:01:54 2013
@@ -859,10 +859,12 @@ cc_sharing_panel_init (CcSharingPanel *self)
G_CALLBACK (cc_sharing_panel_master_switch_notify), self);
--- panels/sharing/cc-sharing-panel.c.orig Fri Mar 15 12:59:32 2013
+++ panels/sharing/cc-sharing-panel.c Wed Apr 10 11:03:56 2013
@@ -59,6 +59,7 @@ _gtk_builder_get_widget (GtkBuilder *builder,
#define VINO_SCHEMA_ID "org.gnome.Vino"
#define FILE_SHARING_SCHEMA_ID "org.gnome.desktop.file-sharing"
+#define FILE_SHARING_BLUETOOTH_SCHEMA_ID "org.gnome.desktop.file-sharing-bluetooth"
struct _CcSharingPanelPrivate
{
@@ -375,7 +376,7 @@ cc_sharing_panel_setup_bluetooth_sharing_dialog (CcSha
WID ("receive-files-grid"),
NULL);
- settings = g_settings_new (FILE_SHARING_SCHEMA_ID);
+ settings = g_settings_new (FILE_SHARING_BLUETOOTH_SCHEMA_ID);
g_settings_bind (settings, "bluetooth-enabled",
WID ("share-public-folder-switch"), "active",
G_SETTINGS_BIND_DEFAULT);
@@ -860,7 +861,7 @@ cc_sharing_panel_init (CcSharingPanel *self)
+#ifdef HAVE_BLUETOOTH
/* bluetooth */
if (cc_sharing_panel_check_schema_available (self, FILE_SHARING_SCHEMA_ID))
- if (cc_sharing_panel_check_schema_available (self, FILE_SHARING_SCHEMA_ID))
+ if (cc_sharing_panel_check_schema_available (self, FILE_SHARING_BLUETOOTH_SCHEMA_ID))
cc_sharing_panel_setup_bluetooth_sharing_dialog (self);
else
+#endif
gtk_widget_hide (WID ("bluetooth-sharing-button"));
/* media sharing */