GNOME.org
 

[gnome-user-share] obexpush: Remove ObexPush support

commit 2acc42792bf879d2a5507253c8bec7f59031558b
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jul 30 15:59:36 2015 +0200

    obexpush: Remove ObexPush support
    
    It now lives directly in gnome-bluetooth's Settings widget, as used
    by gnome-control-center's Bluetooth panel.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753058

 configure.ac                                       |   24 +-
 data/Makefile.am                                   |    7 -
 data/gnome-user-share-obexpush.desktop.in.in       |   11 -
 data/gnome-user-share-webdav.desktop.in.in         |    2 +-
 data/gnome-user-share.convert                      |    3 -
 data/icons/16x16/Makefile.am                       |    6 -
 data/icons/16x16/gnome-obex-server.png             |  Bin 964 -> 0 bytes
 data/icons/16x16/gnome-obex-server.svg             |  128 ---
 data/icons/22x22/Makefile.am                       |    6 -
 data/icons/22x22/gnome-obex-server.png             |  Bin 1537 -> 0 bytes
 data/icons/22x22/gnome-obex-server.svg             |  136 ----
 data/icons/32x32/Makefile.am                       |    6 -
 data/icons/32x32/gnome-obex-server.png             |  Bin 2582 -> 0 bytes
 data/icons/32x32/gnome-obex-server.svg             |  151 ----
 data/icons/48x48/Makefile.am                       |    6 -
 data/icons/48x48/gnome-obex-server.png             |  Bin 4581 -> 0 bytes
 data/icons/48x48/gnome-obex-server.svg             |  171 ----
 data/icons/Makefile.am                             |   17 -
 ...rg.gnome.desktop.file-sharing.gschema.xml.in.in |   18 -
 po/POTFILES.in                                     |    3 -
 po/POTFILES.skip                                   |    1 -
 src/Makefile.am                                    |   21 -
 src/obexpush.c                                     |  842 --------------------
 src/obexpush.h                                     |   63 --
 src/user_share-common.c                            |    8 -
 src/user_share-common.h                            |    1 -
 src/user_share-obexpush.c                          |  245 ------
 src/user_share-private.c                           |   39 -
 src/user_share-private.h                           |   14 -
 29 files changed, 2 insertions(+), 1927 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5be39b0..a2a0850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,18 +57,7 @@ fi
 
 AC_SUBST(HTTPD)
 
-BLUETOOTH_PKG="gnome-bluetooth-1.0 >= 3.9.3"
-AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],[compile without bluetooth 
support]),,enable_bluetooth=yes)
-if test "x$enable_bluetooth" = "xyes"; then
-  PKG_CHECK_MODULES(BLUETOOTH, $BLUETOOTH_PKG)
-  AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if gnome-bluetooth support is available])
-else
-  BLUETOOTH_PKG=""
-  AC_MSG_WARN([Bluetooth support is disabled.])
-fi
-AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
-
-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 libnotify libcanberra-gtk3 
$BLUETOOTH_PKG)
+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 >= 2.26 gtk+-3.0 libnotify libcanberra-gtk3)
 AC_SUBST(USER_SHARE_CFLAGS)
 AC_SUBST(USER_SHARE_LIBS)
 
@@ -188,13 +177,7 @@ fi
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
 data/gnome-user-share-webdav.desktop.in
-data/gnome-user-share-obexpush.desktop.in
 data/org.gnome.desktop.file-sharing.gschema.xml.in
 po/Makefile.in
 src/Makefile
@@ -205,11 +188,6 @@ AC_MSG_NOTICE([gnome-user-share was configured with the following options:])
 AC_MSG_NOTICE([** httpd location: $HTTP])
 AC_MSG_NOTICE([** httpd modules path: $MODULES_PATH])
 AC_MSG_NOTICE([** nautilus extension path: $ac_with_nautilusdir])
-if test "x$enable_bluetooth" = "xyes"; then
-       AC_MSG_NOTICE([** Bluetooth support enabled (ObexPush and ObexFTP)])
-else
-       AC_MSG_NOTICE([   Bluetooth support disabled])
-fi
 
 echo "
 Do note Apache 2.2 and mod_dnssd 0.6 are required to use gnome-user-share.
diff --git a/data/Makefile.am b/data/Makefile.am
index 99a0740..e59cad1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,14 +1,8 @@
-SUBDIRS = icons
-
 @INTLTOOL_DESKTOP_RULE@
 applicationsdir = $(datadir)/applications/
 applications_DATA = $(applications_in_files:.desktop.in=.desktop)
 applications_in_files = gnome-user-share-webdav.desktop.in
 
-autostartdir = $(sysconfdir)/xdg/autostart/
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = gnome-user-share-obexpush.desktop.in
-
 appdir = $(datadir)/gnome-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile
 
@@ -24,7 +18,6 @@ convert_DATA = gnome-user-share.convert
 EXTRA_DIST = $(app_DATA)  \
        $(gsettings_in_files) \
        $(convert_DATA) \
-       gnome-user-share-obexpush.desktop.in.in \
        gnome-user-share-webdav.desktop.in.in
 
 CLEANFILES = $(applications_DATA) $(autostart_DATA) $(gsettings_DATA)
diff --git a/data/gnome-user-share-webdav.desktop.in.in b/data/gnome-user-share-webdav.desktop.in.in
index 4b542fe..d7c47c2 100644
--- a/data/gnome-user-share-webdav.desktop.in.in
+++ b/data/gnome-user-share-webdav.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Personal File Sharing
 _Comment=Launch Personal File Sharing if enabled
-_Keywords=share;files;bluetooth;obex;http;network;copy;send;
+_Keywords=share;files;http;network;copy;send;
 Icon=folder-remote
 Exec= installdir@/gnome-user-share-webdav
 Terminal=false
diff --git a/data/gnome-user-share.convert b/data/gnome-user-share.convert
index 536855d..7d65d03 100644
--- a/data/gnome-user-share.convert
+++ b/data/gnome-user-share.convert
@@ -1,6 +1,3 @@
 [org.gnome.desktop.file-sharing]
 
 require-password = /desktop/gnome/file_sharing/require_password
-bluetooth-obexpush-enabled = /desktop/gnome/file_sharing/bluetooth_obexpush_enabled
-bluetooth-accept-files = /desktop/gnome/file_sharing/bluetooth_accept_files
-bluetooth-notify = /desktop/gnome/file_sharing/bluetooth_notify
diff --git a/data/org.gnome.desktop.file-sharing.gschema.xml.in.in 
b/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
index 277a2b7..f387634 100644
--- a/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
+++ b/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
@@ -5,24 +5,6 @@
                <_summary>When to require passwords</_summary>
                <_description>When to ask for passwords. Possible values are "never", "on_write", and 
"always".</_description>
        </key>
-
-       <key name="bluetooth-obexpush-enabled" type="b">
-               <default>false</default>
-               <_summary>Whether Bluetooth clients can send files using ObexPush.</_summary>
-               <_description>If this is true, Bluetooth devices can send files to the user's Downloads 
directory when logged in.</_description>
-       </key>
-
-       <key name="bluetooth-accept-files" type="s">
-               <default>'bonded'</default>
-               <_summary>When to accept files sent over Bluetooth</_summary>
-               <_description>When to accept files sent over Bluetooth. Possible values are "always", 
"bonded" and "ask".</_description>
-       </key>
-
-       <key name="bluetooth-notify" type="b">
-               <default>true</default>
-               <_summary>Whether to notify about newly received files.</_summary>
-               <_description>Whether to notify about newly received files.</_description>
-       </key>
 </schema>
 </schemalist>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 69045e3..aa3171f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/org.gnome.desktop.file-sharing.gschema.xml.in.in
-data/gnome-user-share-obexpush.desktop.in.in
 data/gnome-user-share-webdav.desktop.in.in
 src/nautilus-share-bar.c
 src/share-extension.c
 src/http.c
-src/obexpush.c
 src/user_share-webdav.c
-src/user_share-obexpush.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 31cbd28..0ded7ba 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/file-share-properties.ui
-data/gnome-user-share-obexpush.desktop.in
 data/gnome-user-share-webdav.desktop.in
 data/org.gnome.desktop.file-sharing.gschema.xml.in
diff --git a/src/Makefile.am b/src/Makefile.am
index f39a161..f0d4e25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,4 @@
-if USE_BLUETOOTH
-libexec_PROGRAMS =                     \
-       gnome-user-share-webdav         \
-       gnome-user-share-obexpush
-else
 libexec_PROGRAMS = gnome-user-share-webdav
-endif
 
 noinst_LTLIBRARIES = libuser-share-common.la
 libuser_share_common_la_SOURCES = user_share-common.c user_share-common.h
@@ -38,21 +32,6 @@ gnome_user_share_webdav_LDADD =              \
        $(USER_SHARE_LIBS)              \
        $(SELINUX_LIBS)
 
-if USE_BLUETOOTH
-gnome_user_share_obexpush_SOURCES =    \
-       user_share-obexpush.c           \
-       user_share-private.h            \
-       user_share-private.c            \
-       obexpush.c                      \
-       obexpush.h
-else
-EXTRA_DIST = user_share-obexpush.c obexpush.c obexpush.h
-endif
-
-gnome_user_share_obexpush_LDADD =      \
-       libuser-share-common.la         \
-       $(USER_SHARE_LIBS)
-
 nautilus_extensiondir = $(NAUTILUSDIR)
 nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
 
diff --git a/src/user_share-common.c b/src/user_share-common.c
index 6821d07..cc1883a 100644
--- a/src/user_share-common.c
+++ b/src/user_share-common.c
@@ -55,14 +55,6 @@ lookup_public_dir (void)
                                   TRUE);
 }
 
-char *
-lookup_download_dir (void)
-{
-       return lookup_special_dir (G_USER_DIRECTORY_DOWNLOAD,
-                                  "Downloads",
-                                  TRUE);
-}
-
 GFile *
 lookup_dir_with_fallback (GUserDirectory directory)
 {
diff --git a/src/user_share-common.h b/src/user_share-common.h
index 1b87c7c..1ee2dae 100644
--- a/src/user_share-common.h
+++ b/src/user_share-common.h
@@ -26,5 +26,4 @@
 #include <gio/gio.h>
 
 char *lookup_public_dir (void);
-char *lookup_download_dir (void);
 GFile *lookup_dir_with_fallback (GUserDirectory directory);
diff --git a/src/user_share-private.c b/src/user_share-private.c
index 98623d8..c84c8ea 100644
--- a/src/user_share-private.c
+++ b/src/user_share-private.c
@@ -34,12 +34,6 @@ static char *password_setting_strings[] = {
     "always"
 };
 
-static char *accept_file_strings[] = {
-    "always",
-    "bonded",
-    "ask"
-};
-
 const char *
 password_string_from_setting (PasswordSetting setting)
 {
@@ -69,36 +63,3 @@ password_setting_from_string (const char *str)
     /* Fallback on secure pref */
     return PASSWORD_ALWAYS;
 }
-
-const char *
-accept_string_from_setting (AcceptSetting setting)
-{
-    
-    if (setting >= 0 && setting <= ACCEPT_ASK)
-       return accept_file_strings[setting];
-    
-    /* Fallback on secure pref */
-    return accept_file_strings[ACCEPT_BONDED];
-}
-
-AcceptSetting
-accept_setting_from_string (const char *str)
-{
-    if (str != NULL) {
-       if (strcmp (str, "always") == 0) {
-           return ACCEPT_ALWAYS;
-       }
-       if (strcmp (str, "bonded") == 0 ||
-           strcmp (str, "bonded_and_trusted") == 0) {
-           return ACCEPT_BONDED;
-       }
-       if (strcmp (str, "ask") == 0) {
-           return ACCEPT_ASK;
-       }
-    }
-       
-    /* Fallback on secure pref */
-    return ACCEPT_BONDED;
-}
-
-
diff --git a/src/user_share-private.h b/src/user_share-private.h
index 3734722..1b02ba3 100644
--- a/src/user_share-private.h
+++ b/src/user_share-private.h
@@ -26,12 +26,7 @@
 #define _USER_SHARE_PRIVATE_H_
 
 #define GNOME_USER_SHARE_SCHEMAS "org.gnome.desktop.file-sharing"
-
-#define FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED "bluetooth-obexpush-enabled"
-
 #define FILE_SHARING_REQUIRE_PASSWORD "require-password"
-#define FILE_SHARING_BLUETOOTH_OBEXPUSH_ACCEPT_FILES "bluetooth-accept-files"
-#define FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY "bluetooth-notify"
 
 typedef enum {
     PASSWORD_NEVER,
@@ -39,16 +34,7 @@ typedef enum {
     PASSWORD_ALWAYS
 } PasswordSetting;
 
-typedef enum {
-       ACCEPT_ALWAYS,
-       ACCEPT_BONDED,
-       ACCEPT_ASK
-} AcceptSetting;
-
 const char *password_string_from_setting (PasswordSetting setting);
 PasswordSetting password_setting_from_string (const char *str);
 
-const char *accept_string_from_setting (AcceptSetting setting);
-AcceptSetting accept_setting_from_string (const char *str);
-
 #endif /* _USER_SHARE_PRIVATE_H_ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]