[Goodies-commits] r6479 - ristretto/branches/ristretto-gio/src

[Stephan Arts]

Author: stephan
Date: 2009-01-16 22:50:57 +0000 (Fri, 16 Jan 2009)
New Revision: 6479

Modified:
   ristretto/branches/ristretto-gio/src/main_window.c
   ristretto/branches/ristretto-gio/src/navigator.c
   ristretto/branches/ristretto-gio/src/navigator.h
Log:
Re-add forward and backward navigation



Modified: ristretto/branches/ristretto-gio/src/main_window.c
===================================================================
--- ristretto/branches/ristretto-gio/src/main_window.c	2009-01-16 22:15:56 UTC (rev 6478)
+++ ristretto/branches/ristretto-gio/src/main_window.c	2009-01-16 22:50:57 UTC (rev 6479)
@@ -138,8 +138,8 @@
         { "fullscreen", GTK_STOCK_FULLSCREEN, N_ ("_Fullscreen"), NULL, NULL, NULL, },
         { "set-as-wallpaper", NULL, N_ ("_Set as Wallpaper"), NULL, NULL, NULL, },
     { "go-menu", NULL, N_ ("_Go"), NULL, },
-        { "forward", GTK_STOCK_GO_FORWARD, N_ ("_Forward"), NULL, NULL, NULL, },
-        { "back", GTK_STOCK_GO_BACK, N_ ("_Back"), NULL, NULL, NULL, },
+        { "forward", GTK_STOCK_GO_FORWARD, N_ ("_Forward"), NULL, NULL, G_CALLBACK (cb_rstto_main_window_next_image), },
+        { "back", GTK_STOCK_GO_BACK, N_ ("_Back"), NULL, NULL, G_CALLBACK (cb_rstto_main_window_previous_image), },
         { "first", GTK_STOCK_GOTO_FIRST, N_ ("_First"), NULL, NULL, NULL, },
         { "last", GTK_STOCK_GOTO_LAST, N_ ("_Last"), NULL, NULL, NULL, },
         { "play", GTK_STOCK_MEDIA_PLAY, N_ ("_Play"), NULL, NULL, NULL, },
@@ -281,7 +281,6 @@
 
     if (window->priv->props.navigator)
     {
-        window->priv->iter = rstto_navigator_get_iter (window->priv->props.navigator);
         position = rstto_navigator_iter_get_position (window->priv->iter);
         count = rstto_navigator_get_n_images (navigator);
         cur_image = rstto_navigator_iter_get_image (window->priv->iter);
@@ -485,6 +484,11 @@
 static void
 cb_rstto_main_window_navigator_new_image (RsttoNavigator *navigator, RsttoImage *image, RsttoMainWindow *window)
 {
+    if (window->priv->iter)
+    {
+        rstto_navigator_iter_free (window->priv->iter);
+    }
+    window->priv->iter = rstto_navigator_get_iter (window->priv->props.navigator);
     rstto_main_window_navigator_iter_changed (window);
 }
 

Modified: ristretto/branches/ristretto-gio/src/navigator.c
===================================================================
--- ristretto/branches/ristretto-gio/src/navigator.c	2009-01-16 22:15:56 UTC (rev 6478)
+++ ristretto/branches/ristretto-gio/src/navigator.c	2009-01-16 22:50:57 UTC (rev 6479)
@@ -194,3 +194,9 @@
         return RSTTO_IMAGE (iter->data->data);
     return NULL;
 }
+
+void
+rstto_navigator_iter_free (RsttoNavigatorIter *iter)
+{
+    g_free (iter);
+}

Modified: ristretto/branches/ristretto-gio/src/navigator.h
===================================================================
--- ristretto/branches/ristretto-gio/src/navigator.h	2009-01-16 22:15:56 UTC (rev 6478)
+++ ristretto/branches/ristretto-gio/src/navigator.h	2009-01-16 22:50:57 UTC (rev 6479)
@@ -73,6 +73,7 @@
 gboolean    rstto_navigator_iter_previous (RsttoNavigatorIter *iter);
 gboolean    rstto_navigator_iter_next (RsttoNavigatorIter *iter);
 gint        rstto_navigator_iter_get_position (RsttoNavigatorIter *iter);
+void        rstto_navigator_iter_free (RsttoNavigatorIter *iter);
 
 
 G_END_DECLS