Merge lp:~qw3rty-rocks/pantheon-photos/fix-1274811 into lp:~pantheon-photos/pantheon-photos/trunk

[Jeremy Vaartjes]

Changed 'Adjust date and time' dialog from OK button to an Apply button

Changed 'Adjust date and time' dialog from OK button to an Apply button

[Danielle Foré (danrabbit)]

Hey Jeremy, Gtk.Stock is now deprecated as of gtk 3.10. Please use button.with_label instead

review: Needs Fixing

[Danielle Foré (danrabbit)]

Did you try building this branch before you committed? :p You've got a little syntax error. extra ";" on line 9 of the diff

review: Needs Fixing

[Jeremy Vaartjes (qw3rty-rocks)]

sorry, I just did a quick edit on my stable elementary and because of old libs could not build it, so I didn't realise the extra semi-colon. I've got arch Linux set up to work so in the future will use that.

[Danielle Foré (danrabbit)]

Hey Jeremy, you really gotta test the branch... This branch produces an empty button. You can simply do

add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
                    ("Apply"), Gtk.ResponseType.OK);

review: Needs Fixing

[Jeremy Vaartjes (qw3rty-rocks)]

sorry for all that (I feel like a really big idiot now). Usually I'm not this bad. Oh well it's fixed now.

[Danielle Foré (danrabbit)]

no worries :p

review: Approve

[Danielle Foré (danrabbit)]

Ah you still forgot the parenthesis! I almost approved it without testing myself lol

review: Needs Fixing

[Danielle Foré (danrabbit)]

Oops, sorry I'm wrong. Looks like it works fine xD

review: Approve

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2013-12-10 00:53:10 +0000
+++ src/Dialogs.vala	2014-02-20 22:12:45 +0000
@@ -1597,7 +1597,7 @@
         set_transient_for(AppWindow.get_instance());
 
         add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                    Gtk.Stock.OK, Gtk.ResponseType.OK);
+                    "Apply", Gtk.ResponseType.OK);
         set_title(Resources.ADJUST_DATE_TIME_LABEL);
 
         calendar = new Gtk.Calendar();