comparison src/pan-view.c @ 1720:f7bb7b83a6ce

fixed pan-view popup menu - removed wrong callback - consider sidecar files in the editor popup
author nadvornik
date Mon, 21 Sep 2009 18:48:32 +0000
parents 717374fb1bbd
children
comparison
equal deleted inserted replaced
1719:9c7d4fe93759 1720:f7bb7b83a6ce
2786 static GList *pan_view_get_fd_list(PanWindow *pw) 2786 static GList *pan_view_get_fd_list(PanWindow *pw)
2787 { 2787 {
2788 GList *list = NULL; 2788 GList *list = NULL;
2789 FileData *fd = pan_menu_click_fd(pw); 2789 FileData *fd = pan_menu_click_fd(pw);
2790 2790
2791 if (fd) list = g_list_append(NULL, file_data_ref(fd)); 2791 if (fd) list = g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd));
2792 2792
2793 return list; 2793 return list;
2794 } 2794 }
2795 2795
2796 static GtkWidget *pan_popup_menu(PanWindow *pw) 2796 static GtkWidget *pan_popup_menu(PanWindow *pw)
2802 GList *editmenu_fd_list; 2802 GList *editmenu_fd_list;
2803 2803
2804 active = (pw->click_pi != NULL); 2804 active = (pw->click_pi != NULL);
2805 2805
2806 menu = popup_menu_short_lived(); 2806 menu = popup_menu_short_lived();
2807 g_signal_connect(G_OBJECT(menu), "destroy",
2808 G_CALLBACK(pan_popup_menu_destroy_cb), pw);
2809 2807
2810 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, 2808 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN,
2811 G_CALLBACK(pan_zoom_in_cb), pw); 2809 G_CALLBACK(pan_zoom_in_cb), pw);
2812 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, 2810 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT,
2813 G_CALLBACK(pan_zoom_out_cb), pw); 2811 G_CALLBACK(pan_zoom_out_cb), pw);