Merge lp:~computergeoffrey/pantheon-photos/master into lp:~pantheon-photos/pantheon-photos/trunk

[Geoffrey De Belie]

Fix segmentation fault in RawsPage.vala (triggered by clicking Raw Photos in the sidebar) and CollectionPage.vala

Fix segmentation fault in RawsPage.vala (triggered by clicking Raw Photos in the sidebar)

[Adam Bieńkowski (donadigo)]

I would like to see it like this like that since we are no longer using "as":

public override bool include_in_view (DataSource source) {
    if (source is Photo) {
        return ((Photo)source).get_master_file_format () == PhotoFileFormat.RAW;
    }

    return false;
}

[Rico Tzschichholz (ricotz)]

> I would like to see it like this like that since we are no longer using "as":

Why?

Using "as" is absolutely fine and better if there is actual access needed to the casted object.

[Adam Bieńkowski (donadigo)]

ricotz: well, I saw that some of our projects started using (Type) casts, but okay then, it's not a requirement, I just wanted to point that out, it's still a good patch though.

[Rico Tzschichholz (ricotz)]

using an "unowned" local variable is mostly preferred to avoid superfluous implicit ref/unref calls

unowned Photo? photo = (source as Photo);

[lp:~computergeoffrey/pantheon-photos/master]

3063. By Geoffrey De Belie on 2016-11-24

Fix segmentation fault in RawsPage.vala (triggered by clicking Raw Photos in the sidebar)

[Geoffrey De Belie (computergeoffrey)]

I did as you suggested, using an unowned variable. I also reduced the lines changed to 1.

review: Needs Resubmitting

[lp:~computergeoffrey/pantheon-photos/master]

3064. By Geoffrey De Belie on 2016-11-24

Fix another segmentation fault, this time in CollectionPage.vala

[Geoffrey De Belie (computergeoffrey)]

I feel this second fix can be part of this merge request as well. Do you prefer a single commit or multiple commits?

[Adam Bieńkowski (donadigo)]

The code looks good now, thanks.

review: Approve (code)

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2016-11-21 07:11:02 +0000
+++ src/CollectionPage.vala	2016-11-24 19:43:08 +0000
@@ -281,7 +281,7 @@
         if (get_view ().get_selected_count () != 1)
             return;
 
-        Photo photo = (Photo) get_view ().get_selected_at (0).get_source ();
+        unowned Photo? photo = get_view ().get_selected_at (0).get_source () as Photo;
         try {
             AppWindow.get_instance ().set_busy_cursor ();
             photo.open_with_external_editor (app);

=== modified file 'src/library/RawsPage.vala'
--- src/library/RawsPage.vala	2016-09-19 21:18:06 +0000
+++ src/library/RawsPage.vala	2016-11-24 19:43:08 +0000
@@ -29,7 +29,7 @@
         }
 
         public override bool include_in_view (DataSource source) {
-            Photo photo = (Photo) source;
+            unowned Photo? photo = source as Photo;
             return photo != null && photo.get_master_file_format () == PhotoFileFormat.RAW;
         }
     }