diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-13 18:55:34 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-13 18:55:34 +0800 |
| commit | cb3e037f8f55f95892104326807d9988be87fbe4 (patch) | |
| tree | acac7b63e7a8b1ea4f37273363cb423dbff491ed /shell | |
| parent | b77871e4fd7a4464e3a2e4e458f0d10e71805a02 (diff) | |
| parent | ee5ca188d56abc91ca9fce034322466d5b0f4b9f (diff) | |
| download | gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.gz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.bz2 gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.lz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.xz gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.tar.zst gsoc2013-evolution-cb3e037f8f55f95892104326807d9988be87fbe4.zip | |
Merge branch 'master' into wip/gsettings
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-migrate.c | 10 | ||||
| -rw-r--r-- | shell/e-shell-window-actions.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 89f94b0f83..dd75a40b82 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -739,6 +739,10 @@ shell_migrate_get_version (EShell *shell, const gchar *key; gchar *string; + *major = 0; + *minor = 0; + *micro = 0; + key = GCONF_VERSION_KEY; client = e_shell_get_gconf_client (shell); string = gconf_client_get_string (client, key, NULL); @@ -747,12 +751,6 @@ shell_migrate_get_version (EShell *shell, /* Since 1.4.0 we've kept the version key in GConf. */ sscanf (string, "%d.%d.%d", major, minor, micro); g_free (string); - - } else { - /* Otherwise, assume it's a new installation. */ - *major = 0; - *minor = 0; - *micro = 0; } } diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index f389b4ea00..de4ce86569 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -2311,7 +2311,7 @@ e_shell_window_update_view_menu (EShellWindow *shell_window) action_name = g_strdup_printf ( "gal-view-%s-%d", view_name, ii); - tooltip = g_strdup_printf ("Select view: %s", item->title); + tooltip = g_strdup_printf (_("Select view: %s"), item->title); radio_action = gtk_radio_action_new ( action_name, item->title, tooltip, NULL, ii); |