[Goodies-commits] r3498 - in ristretto/trunk: po src
Stephan Arts
stephan at xfce.org
Sat Nov 3 09:04:54 CET 2007
Author: stephan
Date: 2007-11-03 08:04:54 +0000 (Sat, 03 Nov 2007)
New Revision: 3498
Modified:
ristretto/trunk/po/nl.po
ristretto/trunk/src/navigator.c
Log:
Update dutch translation
Fix segfault
Modified: ristretto/trunk/po/nl.po
===================================================================
--- ristretto/trunk/po/nl.po 2007-11-02 23:14:58 UTC (rev 3497)
+++ ristretto/trunk/po/nl.po 2007-11-03 08:04:54 UTC (rev 3498)
@@ -105,11 +105,15 @@
#: ../src/main_window.c:1023
msgid "The time individual images are displayed during a slideshow"
-msgstr "De tijd dat individuele afbeeldingen worden weergegeven gedurende een diaweergave"
+msgstr ""
+"De tijd dat individuele afbeeldingen worden weergegeven gedurende een "
+"diaweergave"
#: ../src/main_window.c:1026
msgid "Preload images during slideshow -- uses more memory"
-msgstr "Afbeeldingen vooraf inladen gedurende een diaweergave -- gebruikt meer geheugen"
+msgstr ""
+"Afbeeldingen vooraf inladen gedurende een diaweergave -- gebruikt meer "
+"geheugen"
#: ../src/main_window.c:1027
msgid "_Preload images"
Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c 2007-11-02 23:14:58 UTC (rev 3497)
+++ ristretto/trunk/src/navigator.c 2007-11-03 08:04:54 UTC (rev 3498)
@@ -247,6 +247,12 @@
gdk_pixbuf_loader_close(entry->loader, NULL);
}
+ if (entry->timeout_id)
+ {
+ g_source_remove(entry->timeout_id);
+ entry->timeout_id = 0;
+ }
+
if(entry->animation)
{
g_object_unref(entry->animation);
@@ -285,12 +291,16 @@
nav_entry->io_source_id = 0;
}
+ if (entry->timeout_id)
+ {
+ g_source_remove(entry->timeout_id);
+ entry->timeout_id = 0;
+ }
+
if(nav_entry->loader)
{
g_signal_handlers_disconnect_by_func(nav_entry->loader , cb_rstto_navigator_entry_area_prepared, nav_entry);
gdk_pixbuf_loader_close(nav_entry->loader, NULL);
- g_object_unref(nav_entry->loader);
- nav_entry->loader = NULL;
}
if(nav_entry->animation)
{
@@ -747,6 +757,12 @@
g_source_remove(nav_entry->io_source_id);
}
+ if (nav_entry->timeout_id)
+ {
+ g_source_remove(nav_entry->timeout_id);
+ nav_entry->timeout_id = 0;
+ }
+
if(nav_entry->loader)
{
g_signal_handlers_disconnect_by_func(nav_entry->loader , cb_rstto_navigator_entry_area_prepared, nav_entry);
@@ -919,8 +935,9 @@
case G_IO_STATUS_NORMAL:
if(gdk_pixbuf_loader_write(entry->loader, (const guchar *)buffer, bytes_read, NULL) == FALSE)
{
- gdk_pixbuf_loader_close(entry->loader, NULL);
+ g_io_channel_unref(io_channel);
entry->io_channel = NULL;
+ entry->io_source_id = 0;
return FALSE;
}
return TRUE;
@@ -934,7 +951,10 @@
return FALSE;
break;
case G_IO_STATUS_ERROR:
- gdk_pixbuf_loader_close(entry->loader, NULL);
+ if (entry->loader)
+ {
+ gdk_pixbuf_loader_close(entry->loader, NULL);
+ }
g_io_channel_unref(io_channel);
entry->io_channel = NULL;
entry->io_source_id = 0;
@@ -998,7 +1018,7 @@
}
}
- if (entry->loader)
+ if (entry->loader == loader)
{
g_object_unref(entry->loader);
entry->loader = NULL;
More information about the Goodies-commits
mailing list