From 9af4eb021fd5b34ec1fa4ee6eb01eab0b3924ebc Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 13 Oct 2012 00:42:44 +0200 Subject: fix incorrect FSF address --- src/caja-share-bar.c | 2 +- src/caja-share-bar.h | 2 +- src/file-share-properties.c | 2 +- src/http.c | 2 +- src/http.h | 2 +- src/obexftp.c | 2 +- src/obexftp.h | 2 +- src/obexpush.c | 2 +- src/obexpush.h | 2 +- src/share-extension.c | 4 ++-- src/user_share-common.c | 2 +- src/user_share-common.h | 2 +- src/user_share-private.c | 2 +- src/user_share-private.h | 2 +- src/user_share.c | 2 +- src/user_share.h | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/caja-share-bar.c b/src/caja-share-bar.c index 8741ac4..df2d6a7 100644 --- a/src/caja-share-bar.c +++ b/src/caja-share-bar.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: William Jon McCann * diff --git a/src/caja-share-bar.h b/src/caja-share-bar.h index 0d3df12..ae738fa 100644 --- a/src/caja-share-bar.h +++ b/src/caja-share-bar.h @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: William Jon McCann * diff --git a/src/file-share-properties.c b/src/file-share-properties.c index 0ec5594..a35296f 100644 --- a/src/file-share-properties.c +++ b/src/file-share-properties.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * diff --git a/src/http.c b/src/http.c index 0e198aa..1dff01d 100644 --- a/src/http.c +++ b/src/http.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * diff --git a/src/http.h b/src/http.h index b3ea42b..d1a13f4 100644 --- a/src/http.h +++ b/src/http.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * diff --git a/src/obexftp.c b/src/obexftp.c index b06cf09..7999645 100644 --- a/src/obexftp.c +++ b/src/obexftp.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Bastien Nocera * diff --git a/src/obexftp.h b/src/obexftp.h index c199fd1..a4382e5 100644 --- a/src/obexftp.h +++ b/src/obexftp.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Bastien Nocera * diff --git a/src/obexpush.c b/src/obexpush.c index cb3cde0..2ad1adb 100644 --- a/src/obexpush.c +++ b/src/obexpush.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Bastien Nocera * diff --git a/src/obexpush.h b/src/obexpush.h index 3ac624c..782221a 100644 --- a/src/obexpush.h +++ b/src/obexpush.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Bastien Nocera * diff --git a/src/share-extension.c b/src/share-extension.c index 59aead6..83fb36f 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -16,8 +16,8 @@ * * You should have received a copy of the GNU General Public * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. * */ diff --git a/src/user_share-common.c b/src/user_share-common.c index ae2fd2c..aa0597d 100644 --- a/src/user_share-common.c +++ b/src/user_share-common.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * Bastien Nocera diff --git a/src/user_share-common.h b/src/user_share-common.h index d2895ad..c9c62ce 100644 --- a/src/user_share-common.h +++ b/src/user_share-common.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * Bastien Nocera diff --git a/src/user_share-private.c b/src/user_share-private.c index 4ffd12e..5da48cf 100644 --- a/src/user_share-private.c +++ b/src/user_share-private.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * Bastien Nocera diff --git a/src/user_share-private.h b/src/user_share-private.h index e065e98..3bcbc36 100644 --- a/src/user_share-private.h +++ b/src/user_share-private.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * Bastien Nocera diff --git a/src/user_share.c b/src/user_share.c index ae7b5ff..e3a0e38 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * diff --git a/src/user_share.h b/src/user_share.h index 1ce6f73..c4631bd 100644 --- a/src/user_share.h +++ b/src/user_share.h @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Authors: Alexander Larsson * -- cgit v1.2.1 From 366798a5cd8020de0c1771ca58e2b5c02ce6a482 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:15:08 +0200 Subject: [http] Fix http sharing not workin on Linux 3.0 gnome-user-share tries to discover a free port to run Apache on by bind()ing a struct sockaddr_in with no port specified in src/http.c:get_port(). However, it neglects to specify an address family, so that attempt fails with EINVAL, and the -1 returned gets passed to spawn_httpd() as the port that Apache should be listening on, which causes to Apache promptly and silently bail. This error was caused by a regression in Linux 3.0: http://thread.gmane.org/gmane.linux.network/205326/focus=205328 https://bugzilla.gnome.org/show_bug.cgi?id=660146 http://git.gnome.org/browse/gnome-user-share/commit/?id=24cc0e2ecc60619af0e51e730ef68bf750182dcf --- src/http.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/http.c b/src/http.c index 1dff01d..c07a202 100644 --- a/src/http.c +++ b/src/http.c @@ -79,6 +79,7 @@ get_port (void) memset (&addr, 0, sizeof (addr)); addr.sin_port = 0; addr.sin_addr.s_addr = INADDR_ANY; + addr.sin_family = AF_INET; reuse = 1; setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse)); -- cgit v1.2.1 From dc95eb7d3665927604cfd582dbc2027655fd6c7d Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:17:16 +0200 Subject: [common] Add missing string.h include https://bugzilla.gnome.org/show_bug.cgi?id=664929 http://git.gnome.org/browse/gnome-user-share/commit/?id=e53cb4ddde2ed09433862b3f93d6885075e824e7 --- src/user_share-common.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/user_share-common.c b/src/user_share-common.c index aa0597d..c929f5d 100644 --- a/src/user_share-common.c +++ b/src/user_share-common.c @@ -22,6 +22,8 @@ * */ +#include + #include "user_share-common.h" static char * -- cgit v1.2.1 From 7b59638eafc0950ac4778d144558311abfc4dcf6 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 06:38:41 +0200 Subject: [share-bar] make it a (improved) GtkInfoBar 1. Instead of a GtkBox. This fixes the different appearance of the bar from the rest of the stock Nautilus bars. http://git.gnome.org/browse/gnome-user-share/commit/?id=1cfba2417317e5059635568cb49e5093e989e4fa => Note: Don't use GTK3 functions: gtk_box_new(), gtk_widget_set_halign() Stick with gtk_vbox_new() and gtk_misc_set_alignment(), for now. 2. share-bar: remove unused nautilus_share_bar_get_button() http://git.gnome.org/browse/gnome-user-share/commit/?id=71f364b6646a470e829f87bb1f076ca360fc24c5 3. share-bar: make the label property write only http://git.gnome.org/browse/gnome-user-share/commit/?id=c307a0196399f0ff29be4a7a4fad0a6c43a22e1b 4. share-bar: don't set italic text http://git.gnome.org/browse/gnome-user-share/commit/?id=05df1dd95aef7b164932d89d91004df264bbdbe4 5. Improve the nautilus cluebar (text more concise and bar more compact) http://git.gnome.org/browse/gnome-user-share/commit/?id=8ae76ce81119e63ac6fdfdd537d256bf82069e0a 6. share-bar: remove empty finalize method http://git.gnome.org/browse/gnome-user-share/commit/?id=d1c1de37ba47b723a43c0adff9f78a2fa56e45ae --- src/caja-share-bar.c | 158 +++++++++++++------------------------------------- src/caja-share-bar.h | 6 +- src/share-extension.c | 19 +++--- 3 files changed, 55 insertions(+), 128 deletions(-) (limited to 'src') diff --git a/src/caja-share-bar.c b/src/caja-share-bar.c index df2d6a7..c1e0c06 100644 --- a/src/caja-share-bar.c +++ b/src/caja-share-bar.c @@ -27,15 +27,11 @@ #include "caja-share-bar.h" -static void caja_share_bar_finalize (GObject *object); - #define CAJA_SHARE_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAJA_TYPE_SHARE_BAR, CajaShareBarPrivate)) struct CajaShareBarPrivate { - GtkWidget *button; - GtkWidget *label; - char *str; + GtkWidget *label; }; enum { @@ -43,26 +39,7 @@ enum { PROP_LABEL }; -enum { - ACTIVATE, - LAST_SIGNAL -}; - -static guint signals [LAST_SIGNAL] = { 0, }; - -G_DEFINE_TYPE (CajaShareBar, caja_share_bar, GTK_TYPE_HBOX) - -GtkWidget * -caja_share_bar_get_button (CajaShareBar *bar) -{ - GtkWidget *button; - - g_return_val_if_fail (bar != NULL, NULL); - - button = bar->priv->button; - - return button; -} +G_DEFINE_TYPE (CajaShareBar, caja_share_bar, GTK_TYPE_INFO_BAR) static void caja_share_bar_set_property (GObject *object, @@ -76,11 +53,8 @@ caja_share_bar_set_property (GObject *object, switch (prop_id) { case PROP_LABEL: { - char *str; - g_free (self->priv->str); - str = g_strdup_printf ("%s", g_value_get_string (value)); - gtk_label_set_markup (GTK_LABEL (self->priv->label), str); - self->priv->str = g_value_dup_string (value); + gtk_label_set_text (GTK_LABEL (self->priv->label), + g_value_get_string (value)); break; } default: @@ -89,117 +63,64 @@ caja_share_bar_set_property (GObject *object, } } -static void -caja_share_bar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - CajaShareBar *self; - - self = CAJA_SHARE_BAR (object); - - switch (prop_id) { - case PROP_LABEL: - g_value_set_string (value, self->priv->str); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - static void caja_share_bar_class_init (CajaShareBarClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = caja_share_bar_finalize; - object_class->get_property = caja_share_bar_get_property; object_class->set_property = caja_share_bar_set_property; g_type_class_add_private (klass, sizeof (CajaShareBarPrivate)); - g_object_class_install_property (G_OBJECT_CLASS(klass), - PROP_LABEL, g_param_spec_string ("label", - "label", "The widget's main label", NULL, G_PARAM_READWRITE)); - - - signals [ACTIVATE] = g_signal_new ("activate", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CajaShareBarClass, activate), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - -} - -static void -button_clicked_cb (GtkWidget *button, - CajaShareBar *bar) -{ - g_signal_emit (bar, signals [ACTIVATE], 0); + g_object_class_install_property (G_OBJECT_CLASS(klass), PROP_LABEL, + g_param_spec_string ("label", "label", + "The widget's main label", + NULL, + G_PARAM_WRITABLE)); } static void caja_share_bar_init (CajaShareBar *bar) { - GtkWidget *label; - GtkWidget *hbox; - GtkWidget *vbox; - GtkWidget *image; - char *hint; - - bar->priv = CAJA_SHARE_BAR_GET_PRIVATE (bar); - - hbox = GTK_WIDGET (bar); - - vbox = gtk_vbox_new (FALSE, 6); - gtk_widget_show (vbox); - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + GtkWidget *content_area; + GtkWidget *action_area; + GtkWidget *label; + GtkWidget *vbox; + GtkWidget *button; + PangoAttrList *attrs; - label = gtk_label_new (_("Personal File Sharing")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); + bar->priv = CAJA_SHARE_BAR_GET_PRIVATE (bar); - bar->priv->label = gtk_label_new (""); - hint = g_strdup_printf ("%s", ""); - gtk_label_set_markup (GTK_LABEL (bar->priv->label), hint); - gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); - gtk_widget_show (bar->priv->label); - gtk_box_pack_start (GTK_BOX (vbox), bar->priv->label, TRUE, TRUE, 0); + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar)); + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (bar)); + gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_CENTER); - bar->priv->button = gtk_button_new_with_label (_("Launch Preferences")); - gtk_widget_show (bar->priv->button); - gtk_box_pack_end (GTK_BOX (hbox), bar->priv->button, FALSE, FALSE, 0); + vbox = gtk_vbox_new (FALSE, 3); + gtk_container_add (GTK_CONTAINER (content_area), vbox); - image = gtk_image_new_from_icon_name ("folder-remote", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_button_set_image (GTK_BUTTON (bar->priv->button), image); + attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); + label = gtk_label_new (_("Personal File Sharing")); + gtk_label_set_attributes (GTK_LABEL (label), attrs); + pango_attr_list_unref (attrs); - g_signal_connect (bar->priv->button, "clicked", - G_CALLBACK (button_clicked_cb), - bar); - - gtk_widget_set_tooltip_text (bar->priv->button, - _("Launch Personal File Sharing Preferences")); -} - -static void -caja_share_bar_finalize (GObject *object) -{ - CajaShareBar *bar; + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_show (label); + gtk_container_add (GTK_CONTAINER (vbox), label); - g_return_if_fail (object != NULL); - g_return_if_fail (CAJA_IS_SHARE_BAR (object)); + bar->priv->label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (bar->priv->label), 0.0, 0.5); + gtk_widget_show (bar->priv->label); + gtk_container_add (GTK_CONTAINER (vbox), bar->priv->label); - bar = CAJA_SHARE_BAR (object); + button = gtk_info_bar_add_button (GTK_INFO_BAR (bar), + _("Preferences"), + CAJA_SHARE_BAR_RESPONSE_PREFERENCES); - g_return_if_fail (bar->priv != NULL); + gtk_widget_set_tooltip_text (button, + _("Launch Personal File Sharing Preferences")); - G_OBJECT_CLASS (caja_share_bar_parent_class)->finalize (object); + gtk_widget_show_all (vbox); } GtkWidget * @@ -208,6 +129,7 @@ caja_share_bar_new (const char *label) GObject *result; result = g_object_new (CAJA_TYPE_SHARE_BAR, + "message-type", GTK_MESSAGE_QUESTION, "label", label, NULL); diff --git a/src/caja-share-bar.h b/src/caja-share-bar.h index ae738fa..a4e05fd 100644 --- a/src/caja-share-bar.h +++ b/src/caja-share-bar.h @@ -34,18 +34,20 @@ G_BEGIN_DECLS #define CAJA_IS_SHARE_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CAJA_TYPE_SHARE_BAR)) #define CAJA_SHARE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CAJA_TYPE_SHARE_BAR, CajaShareBarClass)) +#define CAJA_SHARE_BAR_RESPONSE_PREFERENCES 1 + typedef struct CajaShareBarPrivate CajaShareBarPrivate; typedef struct { - GtkHBox box; + GtkInfoBar parent; CajaShareBarPrivate *priv; } CajaShareBar; typedef struct { - GtkHBoxClass parent_class; + GtkInfoBarClass parent_class; void (* activate) (CajaShareBar *bar); diff --git a/src/share-extension.c b/src/share-extension.c index 83fb36f..01a574a 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -104,10 +104,13 @@ launch_prefs_on_window (GtkWindow *window) } static void -bar_activated_cb (CajaShareBar *bar, - gpointer data) +bar_response_cb (CajaShareBar *bar, + gint response, + gpointer data) { - launch_prefs_on_window (GTK_WINDOW (data)); + if (response == CAJA_SHARE_BAR_RESPONSE_PREFERENCES) { + launch_prefs_on_window (GTK_WINDOW (data)); + } } static void @@ -170,17 +173,17 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, share = CAJA_USER_SHARE (iface); if (is_dir[0] != FALSE && is_dir[1] != FALSE) { - bar = caja_share_bar_new (_("You can share files from this folder and receive files to it")); + bar = caja_share_bar_new (_("May be used to share or receive files")); } else if (is_dir[0] != FALSE) { - bar = caja_share_bar_new (_("You can share files from this folder over the network and Bluetooth")); + bar = caja_share_bar_new (_("May be shared over the network or Bluetooth")); } else { - bar = caja_share_bar_new (_("You can receive files over Bluetooth into this folder")); + bar = caja_share_bar_new (_("May be used to receive files over Bluetooth")); } add_widget (share, caja_share_bar_get_button (CAJA_SHARE_BAR (bar))); - g_signal_connect (bar, "activate", - G_CALLBACK (bar_activated_cb), + g_signal_connect (bar, "response", + G_CALLBACK (bar_response_cb), window); gtk_widget_show (bar); -- cgit v1.2.1 From 15ff0663135e48ad2cc50e7e0059da948887f0d4 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 06:47:32 +0200 Subject: [share-bar] simplify code http://git.gnome.org/browse/gnome-user-share/commit/?id=532c0b17416bff0937722d568f699597d9e54a66 --- src/caja-share-bar.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/caja-share-bar.c b/src/caja-share-bar.c index c1e0c06..c704d85 100644 --- a/src/caja-share-bar.c +++ b/src/caja-share-bar.c @@ -126,12 +126,8 @@ caja_share_bar_init (CajaShareBar *bar) GtkWidget * caja_share_bar_new (const char *label) { - GObject *result; - - result = g_object_new (CAJA_TYPE_SHARE_BAR, - "message-type", GTK_MESSAGE_QUESTION, - "label", label, - NULL); - - return GTK_WIDGET (result); + return g_object_new (CAJA_TYPE_SHARE_BAR, + "message-type", GTK_MESSAGE_QUESTION, + "label", label, + NULL); } -- cgit v1.2.1 From 9acddbc84bec236ca91fa210b6b2164a60895615 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:33:06 +0200 Subject: [user-share] add missing glib/gstdio.h include This is needed for g_rename() https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=0a5f5e09ee21207b9fb21a5bb661d0adb8d8e927 --- src/user_share.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/user_share.c b/src/user_share.c index e3a0e38..a646b84 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include -- cgit v1.2.1 From 5c7c3b4bf19b2c53cb20519999ab23c6ece2ac3d Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:36:25 +0200 Subject: [share-extension] remove code that does nothing We keep track of widgets, but don't do anything with them, so just remove this code. https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=f4349765c814b51372702feb47ba45100287fd2b --- src/share-extension.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src') diff --git a/src/share-extension.c b/src/share-extension.c index 01a574a..8f08392 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -54,7 +54,6 @@ typedef struct struct _CajaUserSharePrivate { - GSList *widget_list; }; static GType caja_user_share_get_type (void); @@ -113,24 +112,6 @@ bar_response_cb (CajaShareBar *bar, } } -static void -destroyed_callback (GtkWidget *widget, - CajaUserShare *share) -{ - share->priv->widget_list = g_slist_remove (share->priv->widget_list, widget); -} - -static void -add_widget (CajaUserShare *share, - GtkWidget *widget) -{ - share->priv->widget_list = g_slist_prepend (share->priv->widget_list, widget); - - g_signal_connect (widget, "destroy", - G_CALLBACK (destroyed_callback), - share); -} - static GtkWidget * caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, const char *uri, @@ -138,7 +119,6 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, { GFile *file; GtkWidget *bar; - CajaUserShare *share; guint i; gboolean enable = FALSE; GFile *home; @@ -170,8 +150,6 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, if (enable == FALSE) return NULL; - share = CAJA_USER_SHARE (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) { @@ -180,8 +158,6 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, bar = caja_share_bar_new (_("May be used to receive files over Bluetooth")); } - add_widget (share, caja_share_bar_get_button (CAJA_SHARE_BAR (bar))); - g_signal_connect (bar, "response", G_CALLBACK (bar_response_cb), window); @@ -217,10 +193,6 @@ caja_user_share_finalize (GObject *object) g_return_if_fail (share->priv != NULL); - if (share->priv->widget_list != NULL) { - g_slist_free (share->priv->widget_list); - } - G_OBJECT_CLASS (parent_class)->finalize (object); } -- cgit v1.2.1 From 7039b007c196b8733f78a213ab3be7828c7a967c Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:44:48 +0200 Subject: [share-extension] remove empty finalize method & private structure share-extension: remove empty finalize method https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=48a3b06deb29042731350fd24815e9d56ad1df4a share-extension: remove empty private structure https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=aa18c570a147b1488507aaff3a3018485a210a24 --- src/share-extension.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src') diff --git a/src/share-extension.c b/src/share-extension.c index 8f08392..4c44be3 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -37,12 +37,9 @@ #define CAJA_USER_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_USER_SHARE, CajaUserShare)) #define CAJA_IS_USER_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_USER_SHARE)) -typedef struct _CajaUserSharePrivate CajaUserSharePrivate; - typedef struct { GObject parent_slot; - CajaUserSharePrivate *priv; } CajaUserShare; typedef struct @@ -50,18 +47,9 @@ typedef struct GObjectClass parent_slot; } CajaUserShareClass; -#define CAJA_USER_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAJA_TYPE_USER_SHARE, CajaUserSharePrivate)) - -struct _CajaUserSharePrivate -{ -}; - static GType caja_user_share_get_type (void); static void caja_user_share_register_type (GTypeModule *module); -static GObjectClass *parent_class; - - static void launch_process (char **argv, GtkWindow *parent) { @@ -178,34 +166,13 @@ caja_user_share_location_widget_provider_iface_init (CajaLocationWidgetProviderI static void caja_user_share_instance_init (CajaUserShare *share) { - share->priv = CAJA_USER_SHARE_GET_PRIVATE (share); -} -static void -caja_user_share_finalize (GObject *object) -{ - CajaUserShare *share; - - g_return_if_fail (object != NULL); - g_return_if_fail (CAJA_IS_USER_SHARE (object)); - - share = CAJA_USER_SHARE (object); - - g_return_if_fail (share->priv != NULL); - - G_OBJECT_CLASS (parent_class)->finalize (object); } static void caja_user_share_class_init (CajaUserShareClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - parent_class = g_type_class_peek_parent (klass); - - object_class->finalize = caja_user_share_finalize; - g_type_class_add_private (klass, sizeof (CajaUserSharePrivate)); } static GType share_type = 0; -- cgit v1.2.1 From e01be1188f02dd096b4ea9c1f519c4294cd492d5 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:47:17 +0200 Subject: [obexpush] don't special case GTK <= 2.14 Since we already depend on > 3.0 in configure. https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=4b60c40dfa44382868c5b41b85368b9398c99a4a --- src/obexpush.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src') diff --git a/src/obexpush.c b/src/obexpush.c index 2ad1adb..237ec90 100644 --- a/src/obexpush.c +++ b/src/obexpush.c @@ -81,15 +81,10 @@ notification_launch_action_on_file_cb (NotifyNotification *notification, g_get_current_time (&val); -#if GTK_CHECK_VERSION(2,14,0) ctx = G_APP_LAUNCH_CONTEXT (gdk_app_launch_context_new ()); screen = gdk_screen_get_default (); gdk_app_launch_context_set_screen (GDK_APP_LAUNCH_CONTEXT (ctx), screen); gdk_app_launch_context_set_timestamp (GDK_APP_LAUNCH_CONTEXT (ctx), val.tv_sec); -#else - ctx = NULL; - screen = NULL; -#endif /* We launch the file viewer for the file */ if (g_str_equal (action, "display") != FALSE) { -- cgit v1.2.1 From 67a0c3eda9daf320470855a2417a7ddb8e16a43a Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:50:12 +0200 Subject: [obexpush] fix a compiler warning, and change g_message to g_debug https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=db151a9292e9ff372a7bf6a82071abbedd006d9f --- src/obexpush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/obexpush.c b/src/obexpush.c index 237ec90..e458e6b 100644 --- a/src/obexpush.c +++ b/src/obexpush.c @@ -214,7 +214,7 @@ device_is_authorised (const char *bdaddr) char *device_path; GHashTable *props; - g_message ("checking adapter %s", g_ptr_array_index (adapters, i)); + g_debug ("checking adapter %s", (gchar *) g_ptr_array_index (adapters, i)); adapter = dbus_g_proxy_new_for_name (connection, "org.bluez", g_ptr_array_index (adapters, i), "org.bluez.Adapter"); -- cgit v1.2.1 From 4c6a1bdb10a2c554aedb6bb75a24ca61ef421d6d Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 07:56:23 +0200 Subject: [user-share] declare the x_fd variable as unused Fixes a GCC warning about set but not used variables. https://bugzilla.gnome.org/show_bug.cgi?id=676515 http://git.gnome.org/browse/gnome-user-share/commit/?id=ba5961cb3973df00a2260adc2826ec49077c2484 --- src/user_share.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/user_share.c b/src/user_share.c index a646b84..91e9d69 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -427,7 +427,7 @@ main (int argc, char **argv) { GSettings *settings; Display *xdisplay; - int x_fd; + G_GNUC_UNUSED x_fd; Window selection_owner; Atom xatom; -- cgit v1.2.1 From 40d028e599d8b81f087cf68cb16593e8080d9d17 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 08:20:51 +0200 Subject: [file-share-properties] simplify launching mate-user-share http://git.gnome.org/browse/gnome-user-share/commit/?id=8acfa630af2bab6eb2f5b04e37c4a36d0d55d20f --- src/file-share-properties.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src') diff --git a/src/file-share-properties.c b/src/file-share-properties.c index a35296f..e2aae02 100644 --- a/src/file-share-properties.c +++ b/src/file-share-properties.c @@ -243,23 +243,8 @@ password_combo_changed (GtkComboBox *combo_box) static void launch_share (void) { - char *argv[2]; - int i; - - i = 0; - argv[i++] = USER_SHARE_PROGRAM; - argv[i++] = NULL; - - if (!g_spawn_async (NULL, - argv, - NULL, - 0, /* G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL */ - NULL, - NULL, - NULL, - NULL)) { + if (!g_spawn_command_line_async (USER_SHARE_PROGRAM, NULL)) g_warning ("Unable to start mate-user-share program"); - } } static void -- cgit v1.2.1 From 2a7396735127cf392c93bd74a4e39c2f65bf1ded Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 17 Oct 2012 07:37:20 +0200 Subject: [bar] Hide the share bar when Bluetooth is disabled A bar always appears on top of XDG_DOWNLOAD_DIR view in caja even without a bluetooth adapter present or enabled. This patch uses BluetoothClient's "default-adapter" property to detect whether we have an enabled bluetooth adapter, and only if so, show the bar telling the user they can receive files over bluetooth into this folder. Patch adapted for mate-user-share from Baptiste Mille-Mathias' patch against gnome-user-share, for the same issue. Origin: https://bugzilla.gnome.org/show_bug.cgi?id=613584 --- src/share-extension.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/share-extension.c b/src/share-extension.c index 4c44be3..188c559 100644 --- a/src/share-extension.c +++ b/src/share-extension.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -100,6 +101,27 @@ bar_response_cb (CajaShareBar *bar, } } +static void +downloads_bar_set_from_bluetooth_status (GtkWidget *bar) +{ + BluetoothClient *client; + gboolean bt_powered; + + client = g_object_get_data (G_OBJECT (bar), "bluetooth-client"); + g_object_get (G_OBJECT (client), + "default-adapter-powered", &bt_powered, + NULL); + gtk_widget_set_visible (bar, bt_powered); +} + +static void +default_adapter_powered_cb (GObject *gobject, + GParamSpec *pspec, + GtkWidget *bar) +{ + downloads_bar_set_from_bluetooth_status (bar); +} + static GtkWidget * caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, const char *uri, @@ -143,14 +165,23 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface, } else if (is_dir[0] != FALSE) { bar = caja_share_bar_new (_("May be shared over the network or Bluetooth")); } else { + BluetoothClient *client; + bar = caja_share_bar_new (_("May be used to receive files over Bluetooth")); + + gtk_widget_set_no_show_all (bar, TRUE); + client = bluetooth_client_new (); + g_object_set_data_full (G_OBJECT (bar), "bluetooth-client", client, g_object_unref); + g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered", + G_CALLBACK (default_adapter_powered_cb), bar); + downloads_bar_set_from_bluetooth_status (bar); } g_signal_connect (bar, "response", G_CALLBACK (bar_response_cb), window); - gtk_widget_show (bar); + gtk_widget_show_all (bar); g_object_unref (file); -- cgit v1.2.1