diff options
author | Stefano Karapetsas <[email protected]> | 2013-09-11 01:01:44 -0700 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-09-11 01:01:44 -0700 |
commit | 2a7238bee32de88d24b541acdc06a1d1b3b73b02 (patch) | |
tree | b33ee3e6052a3eb4c9731c649bcdae95054f613e /src/share-extension.c | |
parent | 48b2c97f8a0c7e8cc0d999d5c427c37daf5aabda (diff) | |
parent | 472993545c41fa1c77e672b3e4d0df205a6fa98f (diff) | |
download | mate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.bz2 mate-user-share-2a7238bee32de88d24b541acdc06a1d1b3b73b02.tar.xz |
Merge pull request #14 from NiceandGently/master
Add support for Apache HTTPD 2.4
Diffstat (limited to 'src/share-extension.c')
-rw-r--r-- | src/share-extension.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/share-extension.c b/src/share-extension.c index 188c559..b3b2952 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -27,10 +27,13 @@ #include <string.h> #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <bluetooth-client.h> #include <libcaja-extension/caja-menu-provider.h> #include <libcaja-extension/caja-location-widget-provider.h> +#ifdef HAVE_BLUETOOTH +#include <bluetooth-client.h> +#endif + #include "caja-share-bar.h" #include "user_share-common.h" @@ -101,6 +104,7 @@ bar_response_cb (CajaShareBar *bar, } } ++#ifdef HAVE_BLUETOOTH static void downloads_bar_set_from_bluetooth_status (GtkWidget *bar) { @@ -121,6 +125,7 @@ default_adapter_powered_cb (GObject *gobject, { downloads_bar_set_from_bluetooth_status (bar); } +#endif /* HAVE_BLUETOOTH */ static GtkWidget * caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, @@ -163,8 +168,13 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, if (is_dir[0] != FALSE && is_dir[1] != FALSE) { bar = caja_share_bar_new (_("May be used to share or receive files")); } else if (is_dir[0] != FALSE) { +#ifndef HAVE_BLUETOOTH bar = caja_share_bar_new (_("May be shared over the network or Bluetooth")); +#else + bar = caja_share_bar_new (_("May be shared over the network")); +#endif /* !HAVE_BLUETOOTH */ } else { +#ifdef HAVE_BLUETOOTH BluetoothClient *client; bar = caja_share_bar_new (_("May be used to receive files over Bluetooth")); @@ -175,6 +185,7 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered", G_CALLBACK (default_adapter_powered_cb), bar); downloads_bar_set_from_bluetooth_status (bar); +#endif /* HAVE_BLUETOOTH */ } g_signal_connect (bar, "response", |