[Goodies-commits] r3215 - in ristretto/trunk: po src

[Stephan Arts]

Author: stephan
Date: 2007-09-12 20:23:41 +0000 (Wed, 12 Sep 2007)
New Revision: 3215

Modified:
   ristretto/trunk/po/ChangeLog
   ristretto/trunk/po/de.po
   ristretto/trunk/src/main.c
Log:
Update german translation (thanks to Christian Dywan)
Fix other segfault



Modified: ristretto/trunk/po/ChangeLog
===================================================================
--- ristretto/trunk/po/ChangeLog	2007-09-12 20:20:15 UTC (rev 3214)
+++ ristretto/trunk/po/ChangeLog	2007-09-12 20:23:41 UTC (rev 3215)
@@ -1,3 +1,6 @@
+12-09-2007  Stephan Arts <stephan at xfce.org>
+	* de.po: Update german translation (thanks to Christian Dywan)
+
 08-09-2007  Stephan Arts <stephan at xfce.org>
 	* nl.po: Update dutch translation
 	* de.po: Update german translation (thanks to Christian Dywan)

Modified: ristretto/trunk/po/de.po
===================================================================
--- ristretto/trunk/po/de.po	2007-09-12 20:20:15 UTC (rev 3214)
+++ ristretto/trunk/po/de.po	2007-09-12 20:23:41 UTC (rev 3215)
@@ -49,11 +49,11 @@
 
 #: ../src/main.c:214
 msgid "_Open with..."
-msgstr ""
+msgstr "Ö_fnen mit..."
 
 #: ../src/main.c:222 ../src/main.c:571
 msgid "No applications available"
-msgstr ""
+msgstr "Keine Programme verfügbar"
 
 #.
 #. gtk_menu_shell_append(GTK_MENU_SHELL(menu_edit), menu_item_rotate_left);
@@ -124,7 +124,7 @@
 #: ../src/main.c:1036
 msgid ""
 "Are you sure you want to clear ristretto's list of recently opened documents?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie ristrettos Liste der zuletzt geöffneten Dokumente leeren wollen?"
 
 #: ../ristretto.desktop.in.h:1
 msgid "Image Viewer"

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-09-12 20:20:15 UTC (rev 3214)
+++ ristretto/trunk/src/main.c	2007-09-12 20:23:41 UTC (rev 3215)
@@ -575,26 +575,36 @@
             g_list_foreach(menu_apps_list, (GFunc)g_object_unref, NULL);
             g_list_free(menu_apps_list);
         }
-        menu_apps_list = thunar_vfs_mime_database_get_applications(mime_dbase, info->mime_info);
-        GList *iter = menu_apps_list;
-        if (iter == NULL)
+        if(info)
         {
+            menu_apps_list = thunar_vfs_mime_database_get_applications(mime_dbase, info->mime_info);
+            GList *iter = menu_apps_list;
+            if (iter == NULL)
+            {
+                GtkWidget *bottom_menu_item = gtk_menu_item_new_with_mnemonic(_("No applications available"));
+                gtk_menu_shell_append(GTK_MENU_SHELL(menu_apps), bottom_menu_item);
+                gtk_widget_set_sensitive(bottom_menu_item, FALSE);
+                gtk_widget_show(bottom_menu_item);
+            }
+            while(iter)
+            {
+                GtkWidget *menu_item = gtk_image_menu_item_new_with_label(thunar_vfs_mime_application_get_name(iter->data));
+                GtkWidget *image = gtk_image_new_from_icon_name(thunar_vfs_mime_handler_lookup_icon_name(iter->data, icon_theme), GTK_ICON_SIZE_MENU);
+                gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
+                gtk_menu_shell_append(GTK_MENU_SHELL(menu_apps), menu_item);
+                g_object_set_data(iter->data, "entry", entry);
+                g_signal_connect(menu_item, "activate", G_CALLBACK(cb_rstto_spawn_app), iter->data);
+                gtk_widget_show(menu_item);
+                iter = g_list_next(iter);
+            }
+        }
+        else
+        {
             GtkWidget *bottom_menu_item = gtk_menu_item_new_with_mnemonic(_("No applications available"));
             gtk_menu_shell_append(GTK_MENU_SHELL(menu_apps), bottom_menu_item);
             gtk_widget_set_sensitive(bottom_menu_item, FALSE);
             gtk_widget_show(bottom_menu_item);
         }
-        while(iter)
-        {
-            GtkWidget *menu_item = gtk_image_menu_item_new_with_label(thunar_vfs_mime_application_get_name(iter->data));
-            GtkWidget *image = gtk_image_new_from_icon_name(thunar_vfs_mime_handler_lookup_icon_name(iter->data, icon_theme), GTK_ICON_SIZE_MENU);
-            gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
-            gtk_menu_shell_append(GTK_MENU_SHELL(menu_apps), menu_item);
-            g_object_set_data(iter->data, "entry", entry);
-            g_signal_connect(menu_item, "activate", G_CALLBACK(cb_rstto_spawn_app), iter->data);
-            gtk_widget_show(menu_item);
-            iter = g_list_next(iter);
-        }
     }
 }