diff options
Diffstat (limited to 'share')
-rw-r--r-- | share/Makefile.am | 4 | ||||
-rw-r--r-- | share/caja-share.c | 24 | ||||
-rw-r--r-- | share/caja-share.h | 2 | ||||
-rw-r--r-- | share/libcaja-share.caja-extension.desktop.in.in | 4 | ||||
-rw-r--r-- | share/shares.c | 13 |
5 files changed, 24 insertions, 23 deletions
diff --git a/share/Makefile.am b/share/Makefile.am index 18e6475..9fa4381 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -41,7 +41,11 @@ extensiondir = $(datadir)/caja/extensions extension_in_files = libcaja-share.caja-extension.desktop.in extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) $(extension_DATA): $(extension_in_files) +if USE_NLS $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ +else + $(AM_V_GEN) cp $< $@ +endif EXTRA_DIST = share-dialog.ui diff --git a/share/caja-share.c b/share/caja-share.c index e7d1a10..c2be439 100644 --- a/share/caja-share.c +++ b/share/caja-share.c @@ -23,6 +23,8 @@ #include <config.h> #endif +#include <glib/gi18n-lib.h> + #include <libcaja-extension/caja-extension-types.h> #include <libcaja-extension/caja-column-provider.h> #include <libcaja-extension/caja-extension-types.h> @@ -33,8 +35,6 @@ #include "caja-share.h" -#include <glib/gi18n-lib.h> - #include <gio/gio.h> #include <gtk/gtk.h> @@ -49,7 +49,6 @@ #include "shares.h" - #define NEED_IF_GUESTOK_MASK (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* need go+rx for guest enabled usershares */ #define NEED_IF_WRITABLE_MASK (S_IWGRP | S_IWOTH) /* writable usershares need go+w additionally*/ #define NEED_ALL_MASK (NEED_IF_GUESTOK_MASK | NEED_IF_WRITABLE_MASK) @@ -435,7 +434,6 @@ get_fullpath_from_fileinfo(CajaFileInfo *fileinfo) return(fullpath); } - /*--------------------------------------------------------------------------*/ static void property_page_set_warning (PropertyPage *page) @@ -692,9 +690,10 @@ create_property_page (CajaFileInfo *fileinfo) error = NULL; } - page->ui = gtk_builder_new (); +#ifdef ENABLE_NLS gtk_builder_set_translation_domain (page->ui, GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ g_assert (gtk_builder_add_from_file (page->ui, INTERFACES_DIR"/share-dialog.ui", &error)); @@ -883,7 +882,6 @@ get_share_status_and_free_share_info (ShareInfo *share_info) return result; } - /*--------------------------------------------------------------------------*/ static void get_share_info_for_file_info (CajaFileInfo *file, ShareInfo **share_info, gboolean *is_shareable) @@ -992,7 +990,6 @@ caja_share_update_file_info (CajaInfoProvider *provider, return CAJA_OPERATION_COMPLETE; } - static void caja_share_cancel_update (CajaInfoProvider *provider, CajaOperationHandle *handle) @@ -1204,6 +1201,7 @@ caja_share_register_type (GTypeModule *module) sizeof (CajaShare), 0, (GInstanceInitFunc) caja_share_instance_init, + NULL }; share_type = g_type_module_register_type (module, @@ -1222,7 +1220,6 @@ caja_share_register_type (GTypeModule *module) CAJA_TYPE_PROPERTY_PAGE_PROVIDER, &property_page_provider_iface_info); - static const GInterfaceInfo info_provider_iface_info = { (GInterfaceInitFunc) caja_share_info_provider_iface_init, NULL, @@ -1258,19 +1255,20 @@ caja_share_register_type (GTypeModule *module) void caja_module_initialize (GTypeModule *module) { - /*g_print ("Initializing caja-share extension\n");*/ - - bindtextdomain(GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + g_print ("Initializing caja-share extension\n"); caja_share_register_type (module); +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +#endif /* ENABLE_NLS */ } /* Perform module-specific shutdown. */ void caja_module_shutdown (void) { - /*g_print ("Shutting down caja-share extension\n");*/ + g_print ("Shutting down caja-share extension\n"); /* FIXME freeing */ } diff --git a/share/caja-share.h b/share/caja-share.h index a8b0b82..7f9a172 100644 --- a/share/caja-share.h +++ b/share/caja-share.h @@ -30,7 +30,6 @@ G_BEGIN_DECLS * instantiated by caja. It implements the GInterfaces * exported by libcaja. */ - typedef struct _CajaShare CajaShare; typedef struct _CajaShareClass CajaShareClass; @@ -44,7 +43,6 @@ struct _CajaShareClass { /* No extra class members */ }; - typedef struct _CajaShareData CajaShareData; struct _CajaShareData { diff --git a/share/libcaja-share.caja-extension.desktop.in.in b/share/libcaja-share.caja-extension.desktop.in.in index cfeb155..0387bb3 100644 --- a/share/libcaja-share.caja-extension.desktop.in.in +++ b/share/libcaja-share.caja-extension.desktop.in.in @@ -4,6 +4,6 @@ Icon=folder-remote Name=Share Description=Allows to quickly share a folder Author=Sebastien Estienne <[email protected]> -Copyright=Copyright (C) 2005 Ethium, Inc. +Copyright=Copyright (C) 2005 Ethium, Inc.\nCopyright (C) 2013-2014 Stefano Karapetsas\nCopyright (C) 2015-2021 MATE developers Version=@VERSION@ -Website=https://mate-desktop.org/ +Website=@PACKAGE_URL@ diff --git a/share/shares.c b/share/shares.c index 2e39d56..e5b16d4 100644 --- a/share/shares.c +++ b/share/shares.c @@ -1,9 +1,14 @@ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif + +#include <glib/gi18n-lib.h> + #include <string.h> #include <time.h> #include <sys/types.h> #include <sys/wait.h> -#include <glib/gi18n-lib.h> + #include "shares.h" #undef DEBUG_SHARES @@ -25,8 +30,6 @@ static time_t refresh_timestamp; #define KEY_COMMENT "comment" #define KEY_ACL "usershare_acl" #define KEY_GUEST_OK "guest_ok" -#define GROUP_ALLOW_GUESTS "global" -#define KEY_ALLOW_GUESTS "usershare allow guests" /* Debugging flags */ static gboolean throw_error_on_refresh; @@ -215,7 +218,6 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro return retval; } - /* Internals */ static void @@ -620,7 +622,7 @@ add_share (ShareInfo *info, GError **error) return FALSE; argv[0] = "add"; - argv[1] = "-l"; + argv[1] = "--long"; argv[2] = info->share_name; argv[3] = info->path; argv[4] = info->comment; @@ -753,7 +755,6 @@ modify_share (const char *old_path, ShareInfo *info, GError **error) return add_share (info, error); } - /* Public API */ GQuark |