Merge lp:~meese/pantheon-photos/fix-vala26 into lp:~pantheon-photos/pantheon-photos/trunk

[meese]

Fixes syntax errors while building with valac 0.26

fixes vala .26 build failure caused by warnings, passing -X flags lines in makefile do nothing and causes a warning under .26 and wrong number of arguments for string format calls gives a warning now

[Robert Roth (evfool)]

Code-wise the changes look fair, but I don't have valac 0.26 to test.

[Rico Tzschichholz (ricotz)]

Omit the params completely and just output: "OAuth Access Token has Expired. Logout user."

Use "...".printf (response) in FlickrPublishing.vala

There are a bunch more warnings leading to build failures using valac 0.25.2

[lp:~meese/pantheon-photos/fix-vala26]

2592. By meese on 2014-08-29

fixes vala 0.25.2 errors

2593. By meese on 2014-08-29

merge from trunk

[meese (meese)]

fixed (0.25.2 wasn't out yet when I did this :P)

[Rico Tzschichholz (ricotz)]

"set_default_icon_list ((owned) pixbuf_list);" should be
"set_default_icon_list (pixbuf_list.copy ());"

Explicitly use "public" for the struct-fields instead of just dropping the "private".

*No* need to touch "private const int NO_SCALE = 0;"

[meese (meese)]

>"set_default_icon_list ((owned) pixbuf_list);" should be
>"set_default_icon_list (pixbuf_list.copy ());"
hm isn't ownership transfer a better idea here as were not using pixbuf_list again?

[lp:~meese/pantheon-photos/fix-vala26]

2594. By meese on 2014-08-29

style and list owned fixed

[meese (meese)]

fixed

[lp:~meese/pantheon-photos/fix-vala26]

2595. By meese on 2014-08-29

extra space

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-08-27 06:20:32 +0000
+++ Makefile	2014-08-29 21:21:35 +0000
@@ -646,8 +646,6 @@
 	$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
 		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
 		$(foreach vapidir,$(VAPI_DIRS),--vapidir=$(vapidir)) \
-		$(foreach def,$(DEFINES),-X -D$(def)) \
-		$(foreach hdir,$(HEADER_DIRS),-X -I$(hdir)) \
 		$(VALAFLAGS) \
 		$(EXPANDED_SRC_FILES)
 	@touch $@

=== modified file 'plugins/shotwell-publishing/FacebookPublishing.vala'
--- plugins/shotwell-publishing/FacebookPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/FacebookPublishing.vala	2014-08-29 21:21:35 +0000
@@ -1493,7 +1493,7 @@
 
         case EXPIRED_SESSION_STATUS_CODE:
             error = new Spit.Publishing.PublishingError.EXPIRED_SESSION (
-                "OAuth Access Token has Expired. Logout user.", real_message.get_uri (), msg.status_code);
+                "OAuth Access Token has Expired. Logout user.");
             break;
 
         case Soup.KnownStatusCode.CANT_RESOLVE:
@@ -1672,4 +1672,3 @@
 }
 
 }
-

=== modified file 'plugins/shotwell-publishing/FlickrPublishing.vala'
--- plugins/shotwell-publishing/FlickrPublishing.vala	2014-08-08 21:13:09 +0000
+++ plugins/shotwell-publishing/FlickrPublishing.vala	2014-08-29 21:21:35 +0000
@@ -397,7 +397,7 @@
 
             if (split_pair.length != 2)
                 host.post_error (new Spit.Publishing.PublishingError.MALFORMED_RESPONSE (
-                                     "'%s' isn't a valid response to an OAuth authentication request"));
+                                     "'%s' isn't a valid response to an OAuth authentication request".printf (response)));
 
             if (split_pair[0] == "oauth_token")
                 oauth_token = split_pair[1];
@@ -407,7 +407,7 @@
 
         if (oauth_token == null || oauth_token_secret == null)
             host.post_error (new Spit.Publishing.PublishingError.MALFORMED_RESPONSE (
-                                 "'%s' isn't a valid response to an OAuth authentication request"));
+                                  "'%s' isn't a valid response to an OAuth authentication request".printf (response)));
 
 
         on_authentication_token_available (oauth_token, oauth_token_secret);
@@ -1368,4 +1368,3 @@
 }
 
 }
-

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2014-08-08 21:13:09 +0000
+++ src/AppWindow.vala	2014-08-29 21:21:35 +0000
@@ -453,7 +453,7 @@
         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);
+        set_default_icon_list (pixbuf_list.copy ());
 
         // restore previous size and maximization state
         if (this is LibraryWindow) {

=== modified file 'src/Dimensions.vala'
--- src/Dimensions.vala	2014-08-08 21:13:09 +0000
+++ src/Dimensions.vala	2014-08-29 21:21:35 +0000
@@ -249,10 +249,10 @@
 public struct Scaling {
     private const int NO_SCALE = 0;
 
-    private ScaleConstraint constraint;
-    private int scale;
-    private Dimensions viewport;
-    private bool scale_up;
+    public ScaleConstraint constraint;
+    public int scale;
+    public Dimensions viewport;
+    public bool scale_up;
 
     private Scaling (ScaleConstraint constraint, int scale, Dimensions viewport, bool scale_up) {
         this.constraint = constraint;
@@ -461,13 +461,13 @@
 }
 
 public struct ZoomState {
-    private Dimensions content_dimensions;
-    private Dimensions viewport_dimensions;
-    private double zoom_factor;
-    private double interpolation_factor;
-    private double min_factor;
-    private double max_factor;
-    private Gdk.Point viewport_center;
+    public Dimensions content_dimensions;
+    public Dimensions viewport_dimensions;
+    public double zoom_factor;
+    public double interpolation_factor;
+    public double min_factor;
+    public double max_factor;
+    public Gdk.Point viewport_center;
 
     public ZoomState (Dimensions content_dimensions, Dimensions viewport_dimensions,
                       double slider_val = 0.0, Gdk.Point? viewport_center = null) {

=== modified file 'vapi/libraw.vapi'
--- vapi/libraw.vapi	2013-05-29 18:52:09 +0000
+++ vapi/libraw.vapi	2014-08-29 21:21:35 +0000
@@ -37,9 +37,9 @@
     public int colors;
     public uint filters;
     
-    private char *make;
-    private char *model;
-    private char *cdesc;
+    public char *make;
+    public char *model;
+    public char *cdesc;
     
     public string get_make() {
         return build_string(make, 64);