diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | daemon/daemon-main-generic.c | 6 | ||||
| -rw-r--r-- | daemon/daemon-main.c | 14 | ||||
| -rw-r--r-- | daemon/daemon-main.h | 1 | ||||
| -rw-r--r-- | daemon/gvfsbackendcdda.c | 6 | ||||
| -rw-r--r-- | daemon/gvfsbackendcdda.h | 3 | ||||
| -rw-r--r-- | daemon/gvfsbackendsmb.c | 6 | ||||
| -rw-r--r-- | daemon/gvfsbackendsmb.h | 3 | ||||
| -rw-r--r-- | daemon/gvfsbackendsmbbrowse.c | 6 | ||||
| -rw-r--r-- | daemon/gvfsbackendsmbbrowse.h | 3 |
10 files changed, 66 insertions, 0 deletions
@@ -1,5 +1,23 @@ 2008-02-28 Benjamin Otte <otte@gnome.org> + reviewed by: A. Walton <awalton@svn.gnome.org> + + * daemon/daemon-main-generic.c: (main): + * daemon/daemon-main.c: (daemon_setup): + * daemon/daemon-main.h: + * daemon/gvfsbackendcdda.c: (g_vfs_cdda_daemon_init): + * daemon/gvfsbackendcdda.h: + * daemon/gvfsbackendsmb.c: (g_vfs_smb_daemon_init): + * daemon/gvfsbackendsmb.h: + * daemon/gvfsbackendsmbbrowse.c: (g_vfs_smb_browse_daemon_init): + * daemon/gvfsbackendsmbbrowse.h: + provide default application names for the daemons. This is necessary + to avoid gnome-keyring from saying "Application" wants access to the + keyring, which could sound very evil for a casual user. + Adds some more strings for the poor translators, too! + +2008-02-28 Benjamin Otte <otte@gnome.org> + * daemon/gvfsbackendftp.c: (do_mount), (try_mount): rewrite login code to use the keyring if available. Also fix mount specs to be unique and display names to list the user while at it. diff --git a/daemon/daemon-main-generic.c b/daemon/daemon-main-generic.c index ff12e187..3de0133b 100644 --- a/daemon/daemon-main-generic.c +++ b/daemon/daemon-main-generic.c @@ -23,6 +23,7 @@ #include <config.h> #include <glib.h> +#include <glib/gi18n.h> #include "daemon-main.h" #include G_STRINGIFY(BACKEND_HEADER) @@ -30,6 +31,11 @@ int main (int argc, char *argv[]) { daemon_init (); +#ifdef BACKEND_SETUP_FUNC + BACKEND_SETUP_FUNC (); +#else + daemon_setup (); +#endif daemon_main (argc, argv, #ifdef MAX_JOB_THREADS MAX_JOB_THREADS, diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c index 9089db6c..b3b2b477 100644 --- a/daemon/daemon-main.c +++ b/daemon/daemon-main.c @@ -67,6 +67,20 @@ daemon_init (void) } } +void +daemon_setup (void) +{ + char *name, *up; + + up = g_ascii_strup (G_STRINGIFY (DEFAULT_BACKEND_TYPE), -1); + /* translators: This is the default daemon's application name, + * the %s is the type of the backend, like "ftp" */ + name = g_strdup_printf (_("%s Filesystem Service"), up); + g_set_application_name (name); + g_free (name); + g_free (up); +} + static void send_spawned (DBusConnection *connection, gboolean succeeded, char *error_message) { diff --git a/daemon/daemon-main.h b/daemon/daemon-main.h index 4928b552..818940a5 100644 --- a/daemon/daemon-main.h +++ b/daemon/daemon-main.h @@ -31,6 +31,7 @@ void daemon_init (void); GMountSpec *daemon_parse_args (int argc, char *argv[], const char *default_type); +void daemon_setup (void); void daemon_main (int argc, char *argv[], int max_job_threads, diff --git a/daemon/gvfsbackendcdda.c b/daemon/gvfsbackendcdda.c index afcfbbe4..3b258a32 100644 --- a/daemon/gvfsbackendcdda.c +++ b/daemon/gvfsbackendcdda.c @@ -932,3 +932,9 @@ g_vfs_backend_cdda_class_init (GVfsBackendCddaClass *klass) backend_class->query_fs_info = do_query_fs_info; backend_class->enumerate = do_enumerate; } + +void +g_vfs_cdda_daemon_init (void) +{ + g_set_application_name (_("Audio CD Filesystem Service")); +} diff --git a/daemon/gvfsbackendcdda.h b/daemon/gvfsbackendcdda.h index 90baa502..4abba370 100644 --- a/daemon/gvfsbackendcdda.h +++ b/daemon/gvfsbackendcdda.h @@ -46,6 +46,9 @@ GType g_vfs_backend_cdda_get_type (void) G_GNUC_CONST; GVfsBackendCdda *g_vfs_backend_cdda_new (void); +#define BACKEND_SETUP_FUNC g_vfs_cdda_daemon_init +void g_vfs_cdda_daemon_init (void); + G_END_DECLS #endif /* __G_VFS_BACKEND_CDDA_H__ */ diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c index dfd0de6b..ba91effa 100644 --- a/daemon/gvfsbackendsmb.c +++ b/daemon/gvfsbackendsmb.c @@ -1843,3 +1843,9 @@ g_vfs_backend_smb_class_init (GVfsBackendSmbClass *klass) #endif } + +void +g_vfs_smb_daemon_init (void) +{ + g_set_application_name (_("Windows Shares Filesystem Service")); +} diff --git a/daemon/gvfsbackendsmb.h b/daemon/gvfsbackendsmb.h index 357188e1..5f1a52b7 100644 --- a/daemon/gvfsbackendsmb.h +++ b/daemon/gvfsbackendsmb.h @@ -45,6 +45,9 @@ struct _GVfsBackendSmbClass GType g_vfs_backend_smb_get_type (void) G_GNUC_CONST; +#define BACKEND_SETUP_FUNC g_vfs_smb_daemon_init +void g_vfs_smb_daemon_init (void); + G_END_DECLS #endif /* __G_VFS_BACKEND_SMB_H__ */ diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c index 97800c02..88ab8051 100644 --- a/daemon/gvfsbackendsmbbrowse.c +++ b/daemon/gvfsbackendsmbbrowse.c @@ -1212,3 +1212,9 @@ g_vfs_backend_smb_browse_class_init (GVfsBackendSmbBrowseClass *klass) #endif } + +void +g_vfs_smb_browse_daemon_init (void) +{ + g_set_application_name (_("Windows Network Filesystem Service")); +} diff --git a/daemon/gvfsbackendsmbbrowse.h b/daemon/gvfsbackendsmbbrowse.h index 7cbec05c..4c013437 100644 --- a/daemon/gvfsbackendsmbbrowse.h +++ b/daemon/gvfsbackendsmbbrowse.h @@ -45,6 +45,9 @@ struct _GVfsBackendSmbBrowseClass GType g_vfs_backend_smb_browse_get_type (void) G_GNUC_CONST; +#define BACKEND_SETUP_FUNC g_vfs_smb_browse_daemon_init +void g_vfs_smb_browse_daemon_init (void); + G_END_DECLS #endif /* __G_VFS_BACKEND_SMB_BROWSE_H__ */ |