[Goodies-commits] r3139 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-09-04 17:46:10 +0000 (Tue, 04 Sep 2007)
New Revision: 3139

Modified:
   ristretto/trunk/src/main.c
   ristretto/trunk/src/thumbnail_viewer.c
Log:
Applied patch from Mike Massonnet (Bug #3529)
Fixed floating-point-exception in thumbnail-viewer.



Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-09-04 16:05:46 UTC (rev 3138)
+++ ristretto/trunk/src/main.c	2007-09-04 17:46:10 UTC (rev 3139)
@@ -210,6 +210,7 @@
     GtkWidget *menu_item_open_dir = gtk_menu_item_new_with_mnemonic(_("O_pen Folder"));
     GtkWidget *menu_item_recently = gtk_menu_item_new_with_mnemonic(_("_Recently used"));
     GtkWidget *menu_item_separator = gtk_separator_menu_item_new();
+    /* GtkWidget *menu_item_close = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, accel_group); */
     GtkWidget *menu_item_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, accel_group);
 
     GtkWidget *menu_file = gtk_menu_new();
@@ -218,6 +219,7 @@
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_open_dir);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_recently);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_separator);
+    /* gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_close);*/
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), menu_item_quit);
     
     GtkWidget *recent_chooser_menu = gtk_recent_chooser_menu_new_for_manager(GTK_RECENT_MANAGER(recent_manager));
@@ -225,7 +227,9 @@
     gtk_recent_filter_add_application(filter, "ristretto");
     gtk_recent_chooser_add_filter(GTK_RECENT_CHOOSER(recent_chooser_menu), filter);
     
-    GtkWidget *menu_item_clear_recent = gtk_menu_item_new_with_mnemonic(_("Cleanup recent documents"));
+    GtkWidget *menu_item_clear_recent = gtk_image_menu_item_new_with_mnemonic(_("Cleanup recent documents"));
+    GtkWidget *img_clear_recent = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
+    gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item_clear_recent), img_clear_recent);
     menu_item_separator = gtk_separator_menu_item_new();
     gtk_menu_shell_append(GTK_MENU_SHELL(recent_chooser_menu), menu_item_separator);
     gtk_menu_shell_append(GTK_MENU_SHELL(recent_chooser_menu), menu_item_clear_recent);

Modified: ristretto/trunk/src/thumbnail_viewer.c
===================================================================
--- ristretto/trunk/src/thumbnail_viewer.c	2007-09-04 16:05:46 UTC (rev 3138)
+++ ristretto/trunk/src/thumbnail_viewer.c	2007-09-04 17:46:10 UTC (rev 3139)
@@ -367,7 +367,10 @@
 static void
 cb_rstto_thumbnailer_nav_new_entry(RsttoNavigator *nav, gint nr, RsttoNavigatorEntry *entry, RsttoThumbnailViewer *viewer)
 {
-    rstto_thumbnail_viewer_paint(viewer);
+    if (GTK_WIDGET_REALIZED(viewer))
+    {
+        rstto_thumbnail_viewer_paint(viewer);
+    }
 }
 
 static void