[frogr] Fix issues with previous commit



commit 85483d7097718c02012a17e2b6486a3e7b0178f2
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Thu Jul 7 17:39:31 2011 +0200

    Fix issues with previous commit

 data/gtkbuilder/frogr-main-view.xml |    2 +-
 src/frogr-main-view.c               |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/data/gtkbuilder/frogr-main-view.xml b/data/gtkbuilder/frogr-main-view.xml
index 2b77a01..77e3935 100644
--- a/data/gtkbuilder/frogr-main-view.xml
+++ b/data/gtkbuilder/frogr-main-view.xml
@@ -171,7 +171,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="remove_pictures_menu_item">
+      <object class="GtkMenuItem" id="remove_pictures_ctxt_menu_item">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="related_action">remove_pictures_action</property>
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index fc0f228..ae52cdc 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -975,7 +975,6 @@ _open_pictures_in_external_viewer (FrogrMainView *self)
 {
   gchar *uris = NULL;
   GSList *pictures, *current_pic;
-  FrogrMainViewPrivate *priv = FROGR_MAIN_VIEW_GET_PRIVATE (self);
 
   if (!_pictures_selected_required_check (self))
     return;
@@ -985,7 +984,7 @@ _open_pictures_in_external_viewer (FrogrMainView *self)
     {
       FrogrPicture *picture = FROGR_PICTURE (current_pic->data);
       gchar *current_uris = uris;
-      uris = g_strconcat (frogr_picture_get_fileuri (picture), " ", current_uris);
+      uris = g_strconcat (frogr_picture_get_fileuri (picture), " ", current_uris, NULL);
       g_free (current_uris);
       current_pic = g_slist_next (current_pic);
     }
@@ -1664,12 +1663,12 @@ frogr_main_view_init (FrogrMainView *self)
 
   /* Accounts menu */
   priv->accounts_menu_item =
-    GTK_WIDGET (gtk_builder_get_object (priv->builder, "accounts_menu_item"));
+    GTK_WIDGET (gtk_builder_get_object (builder, "accounts_menu_item"));
 
   /* "Add to set" menu needs to be assigned to a var so we control
      its visibility directly because it has no action assigned to it */
   priv->add_to_set_menu_item =
-    GTK_WIDGET (gtk_builder_get_object (priv->builder, "add_to_set_menu_item"));
+    GTK_WIDGET (gtk_builder_get_object (builder, "add_to_set_menu_item"));
 
 #ifdef MAC_INTEGRATION
   _tweak_menu_bar_for_mac (self);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]