public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gnome-user-share] wip/oholy/f45-update: - Update to 2.29.91
@ 2026-06-24 11:34 Bastien Nocera
0 siblings, 0 replies; only message in thread
From: Bastien Nocera @ 2026-06-24 11:34 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : f0a1c3ab37c0e61608f5ad681176324b8b14cb88
Author : Bastien Nocera <hadess@fedoraproject.org>
Date : 2010-02-24T11:06:22+00:00
Stats : +7/-1096 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-user-share/c/f0a1c3ab37c0e61608f5ad681176324b8b14cb88?branch=wip/oholy/f45-update
Log:
- Update to 2.29.91
---
diff --git a/.cvsignore b/.cvsignore
index 3ed65d6..47d234f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-user-share-2.28.1.tar.bz2
+gnome-user-share-2.29.91.tar.bz2
diff --git a/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch b/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
deleted file mode 100644
index 3f96dbd..0000000
--- a/0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f26dd4a7ebed90d81a942f0a3cae8d741bbb4ef4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 10 Nov 2009 16:27:13 +0000
-Subject: [PATCH] Avoid crashing when dbus_g_proxy_call() fails but without an error
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=533977
----
- src/obexftp.c | 11 +++++++----
- 1 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/obexftp.c b/src/obexftp.c
-index 02e8956..1037a10 100644
---- a/src/obexftp.c
-+++ b/src/obexftp.c
-@@ -110,11 +110,14 @@ obexftp_stop (gboolean stop_manager)
- return;
-
- if (dbus_g_proxy_call (server_proxy, "Close", &err, G_TYPE_INVALID, G_TYPE_INVALID) == FALSE) {
-- if (g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
-+ if (err == NULL ||
-+ g_error_matches (err, DBUS_GERROR, DBUS_GERROR_REMOTE_EXCEPTION) == FALSE ||
- dbus_g_error_has_name (err, "org.openobex.Error.NotStarted") == FALSE) {
-- g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
-- err->message);
-- g_error_free (err);
-+ if (err != NULL) {
-+ g_printerr ("Stopping Bluetooth ObexFTP server failed: %s\n",
-+ err->message);
-+ g_error_free (err);
-+ }
- return;
- }
- g_error_free (err);
---
-1.6.5.2
-
diff --git a/0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch b/0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
deleted file mode 100644
index 9c33c04..0000000
--- a/0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
+++ /dev/null
@@ -1,684 +0,0 @@
-From b96970a6bf8f1070a3c08b1c781ef08d2ebce525 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 8 Sep 2009 17:26:35 +0100
-Subject: [PATCH] =?utf-8?q?Bug=C2=A0558244=20-=20Enabling=20gnome-user-share=20requires=20changing=20preference=20in=20capplet?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Add a cluebar to the Public and Downloads folders, to allow launching
-the sharing preferences.
----
- configure.in | 8 ++
- po/POTFILES.in | 2 +
- src/Makefile.am | 12 ++
- src/nautilus-share-bar.c | 226 +++++++++++++++++++++++++++++++++++
- src/nautilus-share-bar.h | 61 ++++++++++
- src/share-extension.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 601 insertions(+), 0 deletions(-)
- create mode 100644 src/nautilus-share-bar.c
- create mode 100644 src/nautilus-share-bar.h
- create mode 100644 src/share-extension.c
-
-diff --git a/configure.in b/configure.in
-index 256c596..b9f772e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -124,6 +124,14 @@ AC_ARG_WITH([modules-path],
- MODULES_PATH=$with_modules_path
- AC_SUBST(MODULES_PATH)
-
-+dnl===========================================================================
-+dnl Check for nautilus for the share bar
-+
-+PKG_CHECK_MODULES(EXTENSION,
-+ libnautilus-extension)
-+NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
-+AC_SUBST(NAUTILUSDIR)
-+
- dnl ==========================================================================
-
- dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 6f7bdec..c094fe0 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -4,6 +4,8 @@ data/desktop_gnome_file_sharing.schemas.in
- [type: gettext/glade]data/file-share-properties.ui
- data/gnome-user-share-properties.desktop.in
- data/gnome-user-share.desktop.in.in
-+src/nautilus-share-bar.c
-+src/share-extension.c
- src/file-share-properties.c
- src/http.c
- src/obexpush.c
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 06a5243..47b22e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -26,6 +26,7 @@ INCLUDES= \
- -DHTTPD_MODULES_PATH=\""$(MODULES_PATH)"\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-+ $(EXTENSION_CFLAGS) \
- $(USER_SHARE_CFLAGS) \
- $(USER_SHARE_CONFIG_CFLAGS) \
- $(X_CFLAGS)
-@@ -56,6 +57,17 @@ gnome_file_share_properties_SOURCES = \
- gnome_file_share_properties_LDADD = \
- $(USER_SHARE_CONFIG_LIBS)
-
-+nautilus_extensiondir = $(NAUTILUSDIR)
-+nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
-+
-+libnautilus_share_extension_la_SOURCES = \
-+ nautilus-share-bar.c \
-+ nautilus-share-bar.h \
-+ share-extension.c \
-+ $(NULL)
-+
-+libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS)
-+libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
-
- EXTRA_DIST = marshal.list
-
-diff --git a/src/nautilus-share-bar.c b/src/nautilus-share-bar.c
-new file mode 100644
-index 0000000..b3c427c
---- /dev/null
-+++ b/src/nautilus-share-bar.c
-@@ -0,0 +1,226 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2005 William Jon McCann <mccann@jhu.edu>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * 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.
-+ *
-+ * Authors: William Jon McCann <mccann@jhu.edu>
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <glib/gi18n-lib.h>
-+#include <gtk/gtk.h>
-+
-+#include "nautilus-share-bar.h"
-+
-+static void nautilus_share_bar_finalize (GObject *object);
-+
-+#define NAUTILUS_SHARE_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarPrivate))
-+
-+struct NautilusShareBarPrivate
-+{
-+ GtkTooltips *tooltips;
-+ GtkWidget *button;
-+ GtkWidget *label;
-+ char *str;
-+};
-+
-+enum {
-+ PROP_0,
-+ PROP_LABEL
-+};
-+
-+enum {
-+ ACTIVATE,
-+ LAST_SIGNAL
-+};
-+
-+static guint signals [LAST_SIGNAL] = { 0, };
-+
-+G_DEFINE_TYPE (NautilusShareBar, nautilus_share_bar, GTK_TYPE_HBOX)
-+
-+GtkWidget *
-+nautilus_share_bar_get_button (NautilusShareBar *bar)
-+{
-+ GtkWidget *button;
-+
-+ g_return_val_if_fail (bar != NULL, NULL);
-+
-+ button = bar->priv->button;
-+
-+ return button;
-+}
-+
-+static void
-+nautilus_share_bar_set_property (GObject *object,
-+ guint prop_id,
-+ const GValue *value,
-+ GParamSpec *pspec)
-+{
-+ NautilusShareBar *self;
-+
-+ self = NAUTILUS_SHARE_BAR (object);
-+
-+ switch (prop_id) {
-+ case PROP_LABEL: {
-+ char *str;
-+ g_free (self->priv->str);
-+ str = g_strdup_printf ("<i>%s</i>", g_value_get_string (value));
-+ gtk_label_set_markup (GTK_LABEL (self->priv->label), str);
-+ self->priv->str = g_value_dup_string (value);
-+ break;
-+ }
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+ break;
-+ }
-+}
-+
-+static void
-+nautilus_share_bar_get_property (GObject *object,
-+ guint prop_id,
-+ GValue *value,
-+ GParamSpec *pspec)
-+{
-+ NautilusShareBar *self;
-+
-+ self = NAUTILUS_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
-+nautilus_share_bar_class_init (NautilusShareBarClass *klass)
-+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+ object_class->finalize = nautilus_share_bar_finalize;
-+ object_class->get_property = nautilus_share_bar_get_property;
-+ object_class->set_property = nautilus_share_bar_set_property;
-+
-+ g_type_class_add_private (klass, sizeof (NautilusShareBarPrivate));
-+
-+ 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 (NautilusShareBarClass, activate),
-+ NULL, NULL,
-+ g_cclosure_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+}
-+
-+static void
-+button_clicked_cb (GtkWidget *button,
-+ NautilusShareBar *bar)
-+{
-+ g_signal_emit (bar, signals [ACTIVATE], 0);
-+}
-+
-+static void
-+nautilus_share_bar_init (NautilusShareBar *bar)
-+{
-+ GtkWidget *label;
-+ GtkWidget *hbox;
-+ GtkWidget *vbox;
-+ GtkWidget *image;
-+ char *hint;
-+
-+ bar->priv = NAUTILUS_SHARE_BAR_GET_PRIVATE (bar);
-+
-+ bar->priv->tooltips = gtk_tooltips_new ();
-+ g_object_ref (bar->priv->tooltips);
-+ gtk_object_sink (GTK_OBJECT (bar->priv->tooltips));
-+
-+ 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);
-+
-+ 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->label = gtk_label_new ("");
-+ hint = g_strdup_printf ("<i>%s</i>", "");
-+ 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);
-+
-+ 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);
-+
-+ 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);
-+
-+ g_signal_connect (bar->priv->button, "clicked",
-+ G_CALLBACK (button_clicked_cb),
-+ bar);
-+
-+ gtk_tooltips_set_tip (GTK_TOOLTIPS (bar->priv->tooltips),
-+ bar->priv->button,
-+ _("Launch Personal File Sharing Preferences"),
-+ NULL);
-+}
-+
-+static void
-+nautilus_share_bar_finalize (GObject *object)
-+{
-+ NautilusShareBar *bar;
-+
-+ g_return_if_fail (object != NULL);
-+ g_return_if_fail (NAUTILUS_IS_SHARE_BAR (object));
-+
-+ bar = NAUTILUS_SHARE_BAR (object);
-+
-+ g_return_if_fail (bar->priv != NULL);
-+
-+ if (bar->priv->tooltips != NULL) {
-+ g_object_unref (bar->priv->tooltips);
-+ }
-+
-+ G_OBJECT_CLASS (nautilus_share_bar_parent_class)->finalize (object);
-+}
-+
-+GtkWidget *
-+nautilus_share_bar_new (const char *label)
-+{
-+ GObject *result;
-+
-+ result = g_object_new (NAUTILUS_TYPE_SHARE_BAR,
-+ "label", label,
-+ NULL);
-+
-+ return GTK_WIDGET (result);
-+}
-diff --git a/src/nautilus-share-bar.h b/src/nautilus-share-bar.h
-new file mode 100644
-index 0000000..b7fb1fd
---- /dev/null
-+++ b/src/nautilus-share-bar.h
-@@ -0,0 +1,61 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2005 William Jon McCann <mccann@jhu.edu>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * 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.
-+ *
-+ * Authors: William Jon McCann <mccann@jhu.edu>
-+ *
-+ */
-+
-+#ifndef __NAUTILUS_SHARE_BAR_H
-+#define __NAUTILUS_SHARE_BAR_H
-+
-+#include <gtk/gtk.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NAUTILUS_TYPE_SHARE_BAR (nautilus_share_bar_get_type ())
-+#define NAUTILUS_SHARE_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBar))
-+#define NAUTILUS_SHARE_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
-+#define NAUTILUS_IS_SHARE_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE_BAR))
-+#define NAUTILUS_IS_SHARE_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_SHARE_BAR))
-+#define NAUTILUS_SHARE_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_SHARE_BAR, NautilusShareBarClass))
-+
-+typedef struct NautilusShareBarPrivate NautilusShareBarPrivate;
-+
-+typedef struct
-+{
-+ GtkHBox box;
-+
-+ NautilusShareBarPrivate *priv;
-+} NautilusShareBar;
-+
-+typedef struct
-+{
-+ GtkHBoxClass parent_class;
-+
-+ void (* activate) (NautilusShareBar *bar);
-+
-+} NautilusShareBarClass;
-+
-+GType nautilus_share_bar_get_type (void);
-+GtkWidget *nautilus_share_bar_new (const char *label);
-+
-+GtkWidget *nautilus_share_bar_get_button (NautilusShareBar *bar);
-+
-+G_END_DECLS
-+
-+#endif /* __GS_SHARE_BAR_H */
-diff --git a/src/share-extension.c b/src/share-extension.c
-new file mode 100644
-index 0000000..036ecd3
---- /dev/null
-+++ b/src/share-extension.c
-@@ -0,0 +1,292 @@
-+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 8; tab-width: 8 -*-
-+ *
-+ * Copyright (C) 2003 Novell, Inc.
-+ * Copyright (C) 2003-2004 Red Hat, Inc.
-+ * Copyright (C) 2005 William Jon McCann <mccann@jhu.edu>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * 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.
-+ *
-+ */
-+
-+#include "config.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <glib/gi18n-lib.h>
-+#include <gtk/gtk.h>
-+#include <libnautilus-extension/nautilus-menu-provider.h>
-+#include <libnautilus-extension/nautilus-location-widget-provider.h>
-+
-+#include "nautilus-share-bar.h"
-+
-+#define NAUTILUS_TYPE_SHARE (nautilus_share_get_type ())
-+#define NAUTILUS_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare))
-+#define NAUTILUS_IS_SHARE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SHARE))
-+
-+typedef struct _NautilusSharePrivate NautilusSharePrivate;
-+
-+typedef struct
-+{
-+ GObject parent_slot;
-+ NautilusSharePrivate *priv;
-+} NautilusShare;
-+
-+typedef struct
-+{
-+ GObjectClass parent_slot;
-+} NautilusShareClass;
-+
-+#define NAUTILUS_SHARE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_SHARE, NautilusSharePrivate))
-+
-+struct _NautilusSharePrivate
-+{
-+ GSList *widget_list;
-+};
-+
-+static GType nautilus_share_get_type (void);
-+static void nautilus_share_register_type (GTypeModule *module);
-+
-+static GObjectClass *parent_class;
-+
-+
-+static void
-+launch_process (char **argv, GtkWindow *parent)
-+{
-+ GError *error;
-+ GtkWidget *dialog;
-+
-+ error = NULL;
-+ if (!g_spawn_async (NULL,
-+ argv, NULL,
-+ 0,
-+ NULL, NULL,
-+ NULL,
-+ &error)) {
-+
-+
-+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING,
-+ GTK_BUTTONS_OK, _("Unable to launch the Personal File Sharing preferences"));
-+
-+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
-+
-+ gtk_dialog_run (GTK_DIALOG (dialog));
-+ gtk_widget_destroy (dialog);
-+
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
-+launch_prefs_on_window (GtkWindow *window)
-+{
-+ char *argv [2];
-+
-+ argv [0] = g_build_filename (BINDIR, "gnome-file-share-properties", NULL);
-+ argv [1] = NULL;
-+
-+ launch_process (argv, window);
-+
-+ g_free (argv [0]);
-+}
-+
-+static void
-+bar_activated_cb (NautilusShareBar *bar,
-+ gpointer data)
-+{
-+ launch_prefs_on_window (GTK_WINDOW (data));
-+}
-+
-+static void
-+destroyed_callback (GtkWidget *widget,
-+ NautilusShare *share)
-+{
-+ share->priv->widget_list = g_slist_remove (share->priv->widget_list, widget);
-+}
-+
-+static void
-+add_widget (NautilusShare *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 *
-+nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface,
-+ const char *uri,
-+ GtkWidget *window)
-+{
-+ GFile *file;
-+ GtkWidget *bar;
-+ NautilusShare *share;
-+ guint i;
-+ gboolean enable = FALSE;
-+ const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE, G_USER_DIRECTORY_DOWNLOAD };
-+ gboolean is_dir[] = { FALSE, FALSE };
-+
-+ file = g_file_new_for_uri (uri);
-+
-+ for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) {
-+ const char *path;
-+
-+ path = g_get_user_special_dir (special_dirs[i]);
-+ if (path != NULL) {
-+ GFile *dir;
-+ dir = g_file_new_for_path (path);
-+ if (g_file_equal (dir, file)) {
-+ enable = TRUE;
-+ is_dir[i] = TRUE;
-+ }
-+ g_object_unref (dir);
-+ }
-+ }
-+
-+ if (enable == FALSE)
-+ return NULL;
-+
-+ share = NAUTILUS_SHARE (iface);
-+
-+ if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
-+ bar = nautilus_share_bar_new (_("You can share files from this folder and receive files to it"));
-+ } else if (is_dir[0] != FALSE) {
-+ bar = nautilus_share_bar_new (_("You can share files from this folder over the network and Bluetooth"));
-+ } else {
-+ bar = nautilus_share_bar_new (_("You can receive files over Bluetooth into this folder"));
-+ }
-+
-+ add_widget (share, nautilus_share_bar_get_button (NAUTILUS_SHARE_BAR (bar)));
-+
-+ g_signal_connect (bar, "activate",
-+ G_CALLBACK (bar_activated_cb),
-+ window);
-+
-+ gtk_widget_show (bar);
-+
-+ g_object_unref (file);
-+
-+ return bar;
-+}
-+
-+static void
-+nautilus_share_location_widget_provider_iface_init (NautilusLocationWidgetProviderIface *iface)
-+{
-+ iface->get_widget = nautilus_share_get_location_widget;
-+}
-+
-+static void
-+nautilus_share_instance_init (NautilusShare *share)
-+{
-+ share->priv = NAUTILUS_SHARE_GET_PRIVATE (share);
-+}
-+
-+static void
-+nautilus_share_finalize (GObject *object)
-+{
-+ NautilusShare *share;
-+
-+ g_return_if_fail (object != NULL);
-+ g_return_if_fail (NAUTILUS_IS_SHARE (object));
-+
-+ share = NAUTILUS_SHARE (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);
-+}
-+
-+static void
-+nautilus_share_class_init (NautilusShareClass *klass)
-+{
-+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+ parent_class = g_type_class_peek_parent (klass);
-+
-+ object_class->finalize = nautilus_share_finalize;
-+
-+ g_type_class_add_private (klass, sizeof (NautilusSharePrivate));
-+}
-+
-+static GType share_type = 0;
-+
-+static GType
-+nautilus_share_get_type (void)
-+{
-+ return share_type;
-+}
-+
-+static void
-+nautilus_share_register_type (GTypeModule *module)
-+{
-+ static const GTypeInfo info = {
-+ sizeof (NautilusShareClass),
-+ (GBaseInitFunc) NULL,
-+ (GBaseFinalizeFunc) NULL,
-+ (GClassInitFunc) nautilus_share_class_init,
-+ NULL,
-+ NULL,
-+ sizeof (NautilusShare),
-+ 0,
-+ (GInstanceInitFunc) nautilus_share_instance_init,
-+ };
-+
-+ static const GInterfaceInfo location_widget_provider_iface_info = {
-+ (GInterfaceInitFunc) nautilus_share_location_widget_provider_iface_init,
-+ NULL,
-+ NULL
-+ };
-+
-+ share_type = g_type_module_register_type (module,
-+ G_TYPE_OBJECT,
-+ "NautilusShare",
-+ &info, 0);
-+
-+ g_type_module_add_interface (module,
-+ share_type,
-+ NAUTILUS_TYPE_LOCATION_WIDGET_PROVIDER,
-+ &location_widget_provider_iface_info);
-+}
-+
-+void
-+nautilus_module_initialize (GTypeModule *module)
-+{
-+ nautilus_share_register_type (module);
-+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+}
-+
-+void
-+nautilus_module_shutdown (void)
-+{
-+}
-+
-+void
-+nautilus_module_list_types (const GType **types,
-+ int *num_types)
-+{
-+ static GType type_list [1];
-+
-+ type_list[0] = NAUTILUS_TYPE_SHARE;
-+
-+ *types = type_list;
-+ *num_types = 1;
-+}
---
-1.6.2.5
-
diff --git a/0001-Use-same-directories-in-nautilus-bar-and-app.patch b/0001-Use-same-directories-in-nautilus-bar-and-app.patch
deleted file mode 100644
index 011ccbc..0000000
--- a/0001-Use-same-directories-in-nautilus-bar-and-app.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From 814a647dece14962f878231970cf020f35f382e3 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 3 Nov 2009 01:54:12 +0000
-Subject: [PATCH] Use same directories in nautilus bar and app
-
-We were using different ways to get the public and downloads dir.
-Whereas the main user-share had fallbacks to avoid sharing $HOME,
-the nautilus bar was using the special dirs without any fallbacks.
-
-This moves the common code to user_share-common.[ch] and makes sure
-that fallbacks are used in both cases.
----
- src/Makefile.am | 16 +++++---
- src/http.c | 2 +-
- src/obexftp.c | 2 +-
- src/share-extension.c | 18 ++++------
- src/user_share-common.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++
- src/user_share-common.h | 30 ++++++++++++++++
- src/user_share.c | 35 +------------------
- 7 files changed, 139 insertions(+), 53 deletions(-)
- create mode 100644 src/user_share-common.c
- create mode 100644 src/user_share-common.h
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index fa7aa0a..09e82e3 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -14,6 +14,9 @@ bin_PROGRAMS= \
- libexec_PROGRAMS= \
- gnome-user-share
-
-+noinst_LTLIBRARIES = libuser-share-common.la
-+libuser_share_common_la_SOURCES = user_share-common.c user_share-common.h
-+
- INCLUDES= \
- -DPREFIX=\""$(prefix)"\" \
- -DBINDIR=\""$(bindir)"\" \
-@@ -44,7 +47,8 @@ gnome_user_share_SOURCES = \
- obexpush.h \
- $(MARSHALFILES)
-
--gnome_user_share_LDADD = \
-+gnome_user_share_LDADD = \
-+ libuser-share-common.la \
- $(USER_SHARE_LIBS) \
- $(SELINUX_LIBS) \
- $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-@@ -60,13 +64,13 @@ gnome_file_share_properties_LDADD = \
- nautilus_extensiondir = $(NAUTILUSDIR)
- nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
-
--libnautilus_share_extension_la_SOURCES = \
-- nautilus-share-bar.c \
-- nautilus-share-bar.h \
-- share-extension.c \
-+libnautilus_share_extension_la_SOURCES = \
-+ nautilus-share-bar.c \
-+ nautilus-share-bar.h \
-+ share-extension.c \
- $(NULL)
-
--libnautilus_share_extension_la_LIBADD = $(EXTENSION_LIBS)
-+libnautilus_share_extension_la_LIBADD = libuser-share-common.la $(EXTENSION_LIBS)
- libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
-
- EXTRA_DIST = marshal.list
-diff --git a/src/http.c b/src/http.c
-index 164b291..367394a 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -48,7 +48,7 @@
- #include <selinux/selinux.h>
- #endif
-
--#include "user_share.h"
-+#include "user_share-common.h"
- #include "user_share-private.h"
- #include "http.h"
-
-diff --git a/src/obexftp.c b/src/obexftp.c
-index 89a98ce..02e8956 100644
---- a/src/obexftp.c
-+++ b/src/obexftp.c
-@@ -30,7 +30,7 @@
- #include <string.h>
-
- #include "obexftp.h"
--#include "user_share.h"
-+#include "user_share-common.h"
- #include "user_share-private.h"
-
- static DBusGConnection *connection = NULL;
-diff --git a/src/share-extension.c b/src/share-extension.c
-index 2446d3f..0448414 100644
---- a/src/share-extension.c
-+++ b/src/share-extension.c
-@@ -31,6 +31,7 @@
- #include <libnautilus-extension/nautilus-location-widget-provider.h>
-
- #include "nautilus-share-bar.h"
-+#include "user_share-common.h"
-
- #define NAUTILUS_TYPE_SHARE (nautilus_share_get_type ())
- #define NAUTILUS_SHARE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SHARE, NautilusShare))
-@@ -154,18 +155,13 @@ nautilus_share_get_location_widget (NautilusLocationWidgetProvider *iface,
- g_object_unref (home);
-
- for (i = 0; i < G_N_ELEMENTS (special_dirs); i++) {
-- const char *path;
--
-- path = g_get_user_special_dir (special_dirs[i]);
-- if (path != NULL) {
-- GFile *dir;
-- dir = g_file_new_for_path (path);
-- if (g_file_equal (dir, file)) {
-- enable = TRUE;
-- is_dir[i] = TRUE;
-- }
-- g_object_unref (dir);
-+ GFile *dir;
-+ dir = lookup_dir_with_fallback (special_dirs[i]);
-+ if (g_file_equal (dir, file)) {
-+ enable = TRUE;
-+ is_dir[i] = TRUE;
- }
-+ g_object_unref (dir);
- }
-
- if (enable == FALSE)
-diff --git a/src/user_share-common.c b/src/user_share-common.c
-new file mode 100644
-index 0000000..31389eb
---- /dev/null
-+++ b/src/user_share-common.c
-@@ -0,0 +1,89 @@
-+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-+
-+/*
-+ * Copyright (C) 2004-2009 Red Hat, Inc.
-+ *
-+ * Nautilus is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * Nautilus is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * 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.
-+ *
-+ * Authors: Alexander Larsson <alexl@redhat.com>
-+ * Bastien Nocera <hadess@hadess.net>
-+ *
-+ */
-+
-+#include "user_share-common.h"
-+
-+static char *
-+lookup_special_dir (GUserDirectory directory,
-+ const char *name,
-+ gboolean create_dir)
-+{
-+ const char *special_dir;
-+ char *dir;
-+
-+ special_dir = g_get_user_special_dir (directory);
-+ if (special_dir != NULL && strcmp (special_dir, g_get_home_dir ()) != 0) {
-+ if (create_dir != FALSE)
-+ g_mkdir_with_parents (special_dir, 0755);
-+ return g_strdup (special_dir);
-+ }
-+
-+ dir = g_build_filename (g_get_home_dir (), name, NULL);
-+ if (create_dir != FALSE)
-+ g_mkdir_with_parents (dir, 0755);
-+ return dir;
-+}
-+
-+char *
-+lookup_public_dir (void)
-+{
-+ return lookup_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE,
-+ "Public",
-+ TRUE);
-+}
-+
-+char *
-+lookup_download_dir (void)
-+{
-+ return lookup_special_dir (G_USER_DIRECTORY_DOWNLOAD,
-+ "Downloads",
-+ TRUE);
-+}
-+
-+GFile *
-+lookup_dir_with_fallback (GUserDirectory directory)
-+{
-+ GFile *file;
-+ char *path;
-+ const char *name;
-+
-+ if (directory == G_USER_DIRECTORY_PUBLIC_SHARE)
-+ name = "Public";
-+ else if (directory == G_USER_DIRECTORY_DOWNLOAD)
-+ name = "Downloads";
-+ else
-+ g_assert_not_reached ();
-+
-+ path = lookup_special_dir (directory,
-+ name,
-+ FALSE);
-+
-+ if (path == NULL)
-+ return NULL;
-+
-+ file = g_file_new_for_path (path);
-+ g_free (path);
-+
-+ return file;
-+}
-diff --git a/src/user_share-common.h b/src/user_share-common.h
-new file mode 100644
-index 0000000..1b87c7c
---- /dev/null
-+++ b/src/user_share-common.h
-@@ -0,0 +1,30 @@
-+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-+
-+/*
-+ * Copyright (C) 2004-2009 Red Hat, Inc.
-+ *
-+ * Nautilus is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * Nautilus is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * 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.
-+ *
-+ * Authors: Alexander Larsson <alexl@redhat.com>
-+ * Bastien Nocera <hadess@hadess.net>
-+ *
-+ */
-+
-+#include <glib.h>
-+#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.c b/src/user_share.c
-index ab6a7ca..1976424 100644
---- a/src/user_share.c
-+++ b/src/user_share.c
-@@ -31,6 +31,7 @@
-
- #include "user_share.h"
- #include "user_share-private.h"
-+#include "user_share-common.h"
- #include "http.h"
- #include "obexftp.h"
- #include "obexpush.h"
-@@ -262,40 +263,6 @@ bluez_init (void)
- G_CALLBACK (default_adapter_changed), NULL);
- }
-
--char *
--lookup_public_dir (void)
--{
-- const char *public_dir;
-- char *dir;
--
-- public_dir = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE);
-- if (public_dir != NULL && strcmp (public_dir, g_get_home_dir ()) != 0) {
-- g_mkdir_with_parents (public_dir, 0755);
-- return g_strdup (public_dir);
-- }
--
-- dir = g_build_filename (g_get_home_dir (), "Public", NULL);
-- g_mkdir_with_parents (dir, 0755);
-- return dir;
--}
--
--char *
--lookup_download_dir (void)
--{
-- const char *download_dir;
-- char *dir;
--
-- download_dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
-- if (download_dir != NULL && strcmp (download_dir, g_get_home_dir ()) != 0) {
-- g_mkdir_with_parents (download_dir, 0755);
-- return g_strdup (download_dir);
-- }
--
-- dir = g_build_filename (g_get_home_dir (), "Download", NULL);
-- g_mkdir_with_parents (dir, 0755);
-- return dir;
--}
--
- static void
- migrate_old_configuration (void)
- {
---
-1.6.5.1
-
diff --git a/gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch b/gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch
deleted file mode 100644
index 1576fad..0000000
--- a/gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1a2aff08c16c87fcae10563acd9485624a5e262d Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Mon, 22 Feb 2010 14:26:06 +0100
-Subject: [PATCH] Don't use localized realm string when starting httpd
-
----
- src/http.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 367394a..3367d2a 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -369,7 +369,7 @@ spawn_httpd (int port, pid_t *pid_out)
- free5 = env[i++] = g_strdup_printf ("XDG_PUBLICSHARE_DIR=%s", public_dir);
- free6 = env[i++] = g_strdup_printf ("XDG_CONFIG_HOME=%s", g_get_user_config_dir ());
- free7 = env[i++] = g_strdup_printf ("GUS_SHARE_NAME=%s", get_share_name ());
-- free8 = env[i++] = g_strdup_printf ("GUS_LOGIN_LABEL=%s", _("Please log in as the user guest"));
-+ free8 = env[i++] = g_strdup_printf ("GUS_LOGIN_LABEL=%s", "Please log in as the user guest");
- free9 = env[i++] = g_strdup_printf ("HTTP_MODULES_PATH=%s",get_httpd_modules_path ());
- env[i++] = "LANG=C";
- env[i] = NULL;
---
-1.7.0
-
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 64dfd02..8204516 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,23 +1,11 @@
Summary: Gnome user file sharing
Name: gnome-user-share
-Version: 2.28.1
-Release: 5%{?dist}
+Version: 2.29.91
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-user-share/2.28/%{name}-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=578090
-Patch0: menu-path.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=558244
-# https://bugzilla.gnome.org/show_bug.cgi?id=600499
-Patch1: 0001-Bug-558244-Enabling-gnome-user-share-requires-cha.patch
-%define _default_patch_fuzz 2
-Patch2: 0001-Use-same-directories-in-nautilus-bar-and-app.patch
-BuildRequires: intltool automake autoconf libtool
-# https://bugzilla.redhat.com/show_bug.cgi?id=533977
-Patch3: 0001-Avoid-crashing-when-dbus_g_proxy_call-fails-but-with.patch
-Patch4: gnome-user-share-2.29.xx-httpd-dont-localize-realm.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: httpd >= 2.2.0
@@ -57,13 +45,6 @@ The program also allows to share files using ObexFTP over Bluetooth.
%prep
%setup -q
-%patch0 -p1 -b .menu-path
-%patch1 -p1 -b .cluebar
-%patch2 -p1 -b .dirs
-%patch3 -p1 -b .exit-crash
-%patch4 -p1 -b .httpd-realm
-
-autoreconf -f -i
%build
%configure
@@ -144,6 +125,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/nautilus/extensions-2.0/*.so
%changelog
+* Wed Feb 24 2010 Bastien Nocera <bnocera@redhat.com> 2.29.91-1
+- Update to 2.29.91
+
* Mon Feb 22 2010 Tomas Bzatek <tbzatek@redhat.com> 2.28.1-5
- Don't use localized realm string when starting httpd
diff --git a/menu-path.patch b/menu-path.patch
deleted file mode 100644
index a5729b8..0000000
--- a/menu-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-user-share-2.26.0/help/C/gnome-user-share.xml.menu-path gnome-user-share-2.26.0/help/C/gnome-user-share.xml
---- gnome-user-share-2.26.0/help/C/gnome-user-share.xml.menu-path 2009-04-05 23:02:58.710083486 -0400
-+++ gnome-user-share-2.26.0/help/C/gnome-user-share.xml 2009-04-05 23:04:00.147797756 -0400
-@@ -66,7 +66,7 @@
- <title>Starting &app;</title>
-
- <para>
-- The &app; service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Sessions</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs.
-+ The &app; service is normally started by <application>gnome-session</application> when you log in. You can change this by opening <menuchoice><guimenu>Preferences</guimenu><guimenu>Startup Applications</guimenu></menuchoice> in the <guimenu>System</guimenu> menu, and modifying the 'User Sharing' entry in the list of startup programs.
- </para>
-
- <para>
diff --git a/sources b/sources
index b586bdc..b5de153 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dde75de682805357af5995a748d6e4e gnome-user-share-2.28.1.tar.bz2
+31a7dd82cb26c904f14702fa94a1bc51 gnome-user-share-2.29.91.tar.bz2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-24 11:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-24 11:34 [rpms/gnome-user-share] wip/oholy/f45-update: - Update to 2.29.91 Bastien Nocera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox