Merge lp:~ricotz/midori/format-security into lp:midori

Proposed by Rico Tzschichholz
Status: Merged
Approved by: Cris Dywan
Approved revision: 7026
Merged at revision: 7026
Proposed branch: lp:~ricotz/midori/format-security
Merge into: lp:midori
Diff against target: 23 lines (+2/-0)
2 files modified
extensions/external-download-manager.vala (+1/-0)
extensions/transfers.vala (+1/-0)
To merge this branch: bzr merge lp:~ricotz/midori/format-security
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Cody Garver (community) Approve
Review via email: mp+268570@code.launchpad.net

Commit message

Fix warnings for -Wformat-security

Description of the change

Fix warnings for -Wformat-security

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :
review: Approve
Revision history for this message
Cris Dywan (kalikiana) wrote :

We should look into getting these warnings as errors on our builds, or see if Vala has any way to warn about it.

The change itself is obviously correct.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala 2015-03-18 21:18:11 +0000
+++ extensions/external-download-manager.vala 2015-08-20 06:30:54 +0000
@@ -169,6 +169,7 @@
169 if (message.status_code != 200) {169 if (message.status_code != 200) {
170 var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,170 var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL,
171 Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,171 Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE,
172 "%s",
172 _("The plug-in was unable to connect with aria2:\n" +173 _("The plug-in was unable to connect with aria2:\n" +
173 "Please make sure that aria2 is running with rpc enabled ie: aria2c --enable-rpc\n" +174 "Please make sure that aria2 is running with rpc enabled ie: aria2c --enable-rpc\n" +
174 "If it's so, check it also is using the port 6800.\n" +175 "If it's so, check it also is using the port 6800.\n" +
175176
=== modified file 'extensions/transfers.vala'
--- extensions/transfers.vala 2014-04-23 05:40:37 +0000
+++ extensions/transfers.vala 2015-08-20 06:30:54 +0000
@@ -511,6 +511,7 @@
511 var dialog = new Gtk.MessageDialog (browser,511 var dialog = new Gtk.MessageDialog (browser,
512 Gtk.DialogFlags.DESTROY_WITH_PARENT,512 Gtk.DialogFlags.DESTROY_WITH_PARENT,
513 Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,513 Gtk.MessageType.WARNING, Gtk.ButtonsType.NONE,
514 "%s",
514 _("Some files are being downloaded"));515 _("Some files are being downloaded"));
515 dialog.title = _("Some files are being downloaded");516 dialog.title = _("Some files are being downloaded");
516 dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,517 dialog.add_buttons (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,

Subscribers

People subscribed via source and target branches

to all changes: