Revision: 2061
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2061&view=rev
Author:   phantom_sf
Date:     2008-07-20 16:57:17 +0000 (Sun, 20 Jul 2008)

Log Message:
-----------
2008-07-20 Paul Richardson <phantom_sf at users.sourceforge.net>

        * src/display_photo.c:
        Patch to stop photo action signals being added to actions
        multiple times. Thanks to Andrea.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/display_photo.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog      2008-07-20 14:43:19 UTC (rev 2060)
+++ gtkpod/trunk/ChangeLog      2008-07-20 16:57:17 UTC (rev 2061)
@@ -1,3 +1,9 @@
+2008-07-20 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+       * src/display_photo.c:
+       Patch to stop photo action signals being added to actions
+       multiple times. Thanks to Andrea.
+
 2008-07-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
        * src/fileselection.c

Modified: gtkpod/trunk/src/display_photo.c
===================================================================
--- gtkpod/trunk/src/display_photo.c    2008-07-20 14:43:19 UTC (rev 2060)
+++ gtkpod/trunk/src/display_photo.c    2008-07-20 16:57:17 UTC (rev 2061)
@@ -301,26 +301,26 @@
                        gtk_container_remove (GTK_CONTAINER (photowin), 
photo_viewport);
                        /* we don't need this any more */
                        gtk_widget_destroy (photowin);
+
+                       /* Bring the menus to life */
+                       g_signal_connect (G_OBJECT(photo_add_album_menuItem), 
"activate", G_CALLBACK(on_photodb_add_album_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect (G_OBJECT(photo_add_image_menuItem), 
"activate", G_CALLBACK(on_photodb_add_image_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect 
(G_OBJECT(photo_add_image_dir_menuItem), "activate", 
G_CALLBACK(on_photodb_add_image_dir_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect 
(G_OBJECT(photo_remove_album_menuItem), "activate", 
G_CALLBACK(on_photodb_remove_album_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect 
(G_OBJECT(photo_remove_image_menuItem), "activate", 
G_CALLBACK(on_photodb_remove_image_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect 
(G_OBJECT(photo_view_full_size_menuItem), "activate", 
G_CALLBACK(on_photodb_view_full_size_menuItem_activate), 
+                                         NULL);
+                       g_signal_connect 
(G_OBJECT(photo_rename_album_menuItem), "activate", 
G_CALLBACK(on_photodb_rename_album_menuItem_activate),
+                                         NULL);
                }
 
                if (gtk_widget_get_parent (photo_viewport) == NULL)
                        gtk_container_add (GTK_CONTAINER (main_vbox), 
photo_viewport);
-
-               /* Bring the menus to life */
-               g_signal_connect (G_OBJECT(photo_add_album_menuItem), 
"activate", G_CALLBACK(on_photodb_add_album_menuItem_activate), 
-               NULL);
-               g_signal_connect (G_OBJECT(photo_add_image_menuItem), 
"activate", G_CALLBACK(on_photodb_add_image_menuItem_activate), 
-               NULL);
-               g_signal_connect (G_OBJECT(photo_add_image_dir_menuItem), 
"activate", G_CALLBACK(on_photodb_add_image_dir_menuItem_activate), 
-               NULL);
-               g_signal_connect (G_OBJECT(photo_remove_album_menuItem), 
"activate", G_CALLBACK(on_photodb_remove_album_menuItem_activate), 
-               NULL);
-               g_signal_connect (G_OBJECT(photo_remove_image_menuItem), 
"activate", G_CALLBACK(on_photodb_remove_image_menuItem_activate), 
-               NULL);
-               g_signal_connect (G_OBJECT(photo_view_full_size_menuItem), 
"activate", G_CALLBACK(on_photodb_view_full_size_menuItem_activate), 
-                               NULL);
-               g_signal_connect (G_OBJECT(photo_rename_album_menuItem), 
"activate", G_CALLBACK(on_photodb_rename_album_menuItem_activate),
-                               NULL);
                
        } else
        {


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to