diff options
Diffstat (limited to 'share')
| -rw-r--r-- | share/caja-share.c | 11 | ||||
| -rw-r--r-- | share/caja-share.h | 2 | ||||
| -rw-r--r-- | share/shares.c | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/share/caja-share.c b/share/caja-share.c index c23c3f0..c2be439 100644 --- a/share/caja-share.c +++ b/share/caja-share.c @@ -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,7 +690,6 @@ create_property_page (CajaFileInfo *fileinfo) error = NULL; } - page->ui = gtk_builder_new (); #ifdef ENABLE_NLS gtk_builder_set_translation_domain (page->ui, GETTEXT_PACKAGE); @@ -885,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) @@ -994,7 +990,6 @@ caja_share_update_file_info (CajaInfoProvider *provider, return CAJA_OPERATION_COMPLETE; } - static void caja_share_cancel_update (CajaInfoProvider *provider, CajaOperationHandle *handle) @@ -1206,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, @@ -1224,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, @@ -1263,6 +1258,10 @@ caja_module_initialize (GTypeModule *module) 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. */ 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/shares.c b/share/shares.c index b628321..e5b16d4 100644 --- a/share/shares.c +++ b/share/shares.c @@ -31,7 +31,6 @@ static time_t refresh_timestamp; #define KEY_ACL "usershare_acl" #define KEY_GUEST_OK "guest_ok" - /* Debugging flags */ static gboolean throw_error_on_refresh; static gboolean throw_error_on_add; @@ -219,7 +218,6 @@ net_usershare_run (int argc, char **argv, GKeyFile **ret_key_file, GError **erro return retval; } - /* Internals */ static void @@ -624,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; @@ -757,7 +755,6 @@ modify_share (const char *old_path, ShareInfo *info, GError **error) return add_share (info, error); } - /* Public API */ GQuark |