Merge lp:~victored/pantheon-photos/fix-warnings into lp:~pantheon-photos/pantheon-photos/trunk

[Victor Martinez]

Fix several application warnings caused by programming errors

[lp:~victored/pantheon-photos/fix-warnings]

2827. By Victor Martinez on 2015-09-21

fix more warnings and rework code logic a bit

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-09-05 18:50:53 +0000
+++ src/AppWindow.vala	2015-09-21 05:25:37 +0000
@@ -450,11 +450,6 @@
 
         set_default_title ();
 
-        GLib.List<Gdk.Pixbuf> pixbuf_list = new GLib.List<Gdk.Pixbuf> ();
-        foreach (string resource in Resources.APP_ICONS)
-            pixbuf_list.append (Resources.get_icon (resource, 0));
-        set_default_icon_list (pixbuf_list.copy ());
-
         // restore previous size and maximization state
         if (this is LibraryWindow) {
             Config.Facade.get_instance ().get_library_window_state (out maximized, out dimensions);

=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2014-08-28 14:41:02 +0000
+++ src/MediaPage.vala	2015-09-21 05:25:37 +0000
@@ -462,9 +462,6 @@
 
         update_development_menu_item_sensitivity ();
 
-        set_action_sensitive ("PlayVideo", selected_count == 1
-                              && get_view ().get_selected_source_at (0) is Video);
-
         update_flag_action (selected_count);
 
         base.update_actions (selected_count, count);

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2015-08-09 21:54:34 +0000
+++ src/Resources.vala	2015-09-21 05:25:37 +0000
@@ -90,11 +90,6 @@
 public const string MERGE = "object-merge";
 
 public const string ICON_APP = "multimedia-photo-manager";
-public const string ICON_APP16 = "multimedia-photo-manager";
-public const string ICON_APP24 = "multimedia-photo-manager";
-
-public const string APP_ICONS[] = { ICON_APP, ICON_APP16, ICON_APP24 };
-
 public const string ICON_ABOUT_LOGO = "multimedia-photo-manager";
 public const string ICON_GENERIC_PLUGIN = "extension";
 public const string ICON_SLIDESHOW_EXTENSION_POINT = "media-playback-start";

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2015-09-05 18:50:53 +0000
+++ src/library/LibraryWindow.vala	2015-09-21 05:25:37 +0000
@@ -324,7 +324,7 @@
         preferences.label = Resources.PREFERENCES_MENU;
         actions += preferences;
 
-        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, "Delete All", TRANSLATABLE,
+        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, TRANSLATABLE,
                                   on_empty_trash
                                 };
         empty.label = _ ("_Empty Trash");
@@ -1400,15 +1400,19 @@
             }
         }
 
-        right_frame.remove (welcome_page);
-        if (show) {
-            right_frame.remove (right_vbox);
-            right_frame.add (welcome_page);
-        } else {
-            right_frame.add (right_vbox);
+        if (right_frame != null) {
+            if (right_frame.get_child () != null)
+                right_frame.remove (right_frame.get_child ());
+
+            if (show) {
+                right_frame.add (welcome_page);
+            } else {
+                right_frame.add (right_vbox);
+            }
+
+            right_frame.show_all ();
         }
 
-        right_frame.show_all ();
         set_metadata_sidebar_visible (is_metadata_sidebar_visible ());
     }