gvfs r1434 - in trunk: . daemon

[otte svn gnome org]

Author: otte
Date: Thu Feb 28 21:34:30 2008
New Revision: 1434
URL: http://svn.gnome.org/viewvc/gvfs?rev=1434&view=rev

Log:
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!



Modified:
   trunk/ChangeLog
   trunk/daemon/daemon-main-generic.c
   trunk/daemon/daemon-main.c
   trunk/daemon/daemon-main.h
   trunk/daemon/gvfsbackendcdda.c
   trunk/daemon/gvfsbackendcdda.h
   trunk/daemon/gvfsbackendsmb.c
   trunk/daemon/gvfsbackendsmb.h
   trunk/daemon/gvfsbackendsmbbrowse.c
   trunk/daemon/gvfsbackendsmbbrowse.h

Modified: trunk/daemon/daemon-main-generic.c
==============================================================================
--- trunk/daemon/daemon-main-generic.c	(original)
+++ trunk/daemon/daemon-main-generic.c	Thu Feb 28 21:34:30 2008
@@ -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 @@
 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,

Modified: trunk/daemon/daemon-main.c
==============================================================================
--- trunk/daemon/daemon-main.c	(original)
+++ trunk/daemon/daemon-main.c	Thu Feb 28 21:34:30 2008
@@ -67,6 +67,20 @@
     }
 }
 
+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)
 {

Modified: trunk/daemon/daemon-main.h
==============================================================================
--- trunk/daemon/daemon-main.h	(original)
+++ trunk/daemon/daemon-main.h	Thu Feb 28 21:34:30 2008
@@ -31,6 +31,7 @@
 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,

Modified: trunk/daemon/gvfsbackendcdda.c
==============================================================================
--- trunk/daemon/gvfsbackendcdda.c	(original)
+++ trunk/daemon/gvfsbackendcdda.c	Thu Feb 28 21:34:30 2008
@@ -932,3 +932,9 @@
   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"));
+}

Modified: trunk/daemon/gvfsbackendcdda.h
==============================================================================
--- trunk/daemon/gvfsbackendcdda.h	(original)
+++ trunk/daemon/gvfsbackendcdda.h	Thu Feb 28 21:34:30 2008
@@ -46,6 +46,9 @@
   
 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__ */

Modified: trunk/daemon/gvfsbackendsmb.c
==============================================================================
--- trunk/daemon/gvfsbackendsmb.c	(original)
+++ trunk/daemon/gvfsbackendsmb.c	Thu Feb 28 21:34:30 2008
@@ -1843,3 +1843,9 @@
 #endif
 
 }
+
+void
+g_vfs_smb_daemon_init (void)
+{
+  g_set_application_name (_("Windows Shares Filesystem Service"));
+}

Modified: trunk/daemon/gvfsbackendsmb.h
==============================================================================
--- trunk/daemon/gvfsbackendsmb.h	(original)
+++ trunk/daemon/gvfsbackendsmb.h	Thu Feb 28 21:34:30 2008
@@ -45,6 +45,9 @@
 
 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__ */

Modified: trunk/daemon/gvfsbackendsmbbrowse.c
==============================================================================
--- trunk/daemon/gvfsbackendsmbbrowse.c	(original)
+++ trunk/daemon/gvfsbackendsmbbrowse.c	Thu Feb 28 21:34:30 2008
@@ -1212,3 +1212,9 @@
 #endif
 
 }
+
+void
+g_vfs_smb_browse_daemon_init (void)
+{
+  g_set_application_name (_("Windows Network Filesystem Service"));
+}

Modified: trunk/daemon/gvfsbackendsmbbrowse.h
==============================================================================
--- trunk/daemon/gvfsbackendsmbbrowse.h	(original)
+++ trunk/daemon/gvfsbackendsmbbrowse.h	Thu Feb 28 21:34:30 2008
@@ -45,6 +45,9 @@
 
 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__ */