Pantheon Polkit Agent

Merge lp:~philip.scott/pantheon-agent-polkit/pantheon-agent-polkit into lp:~elementary-pantheon/pantheon-agent-polkit/trunk

  1. pantheon-agent-polkit
  2. Merge into trunk
Proposed by Felipe Escoto
Status: Merged
Approved by: Danielle Foré
Approved revision: 31
Merged at revision: 31
Proposed branch: lp:~philip.scott/pantheon-agent-polkit/pantheon-agent-polkit
Merge into: lp:~elementary-pantheon/pantheon-agent-polkit/trunk
Diff against target: 50 lines (+5/-5)
2 files modified
data/CMakeLists.txt (+1/-1)
src/PolkitDialog.vala (+4/-4)
To merge this branch: bzr merge lp:~philip.scott/pantheon-agent-polkit/pantheon-agent-polkit
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+302494@code.launchpad.net

Commit message

match dialog to it's .desktop

Description of the change

It appeared that the reason it wasn't using the translations it was because the name key on the installed .desktop was "_Name=...." instead of "Name=....", that and the Dialog also had no window name attached to it

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

works for me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2016-07-30 16:12:31 +0000
3+++ data/CMakeLists.txt 2016-08-10 00:00:44 +0000
4@@ -1,5 +1,5 @@
5 include(Translations)
6
7-configure_file(org.pantheon.agent-polkit.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.agent-polkit.desktop)
8+configure_file(org.pantheon.agent-polkit.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.agent-polkit.desktop.in)
9 configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.agent-polkit.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.agent-polkit.desktop ${CMAKE_SOURCE_DIR}/po/)
10 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.agent-polkit.desktop DESTINATION share/applications)
11
12=== renamed file 'data/org.pantheon.agent-polkit.desktop.in' => 'data/org.pantheon.agent-polkit.desktop.in.in'
13=== modified file 'src/PolkitDialog.vala'
14--- src/PolkitDialog.vala 2016-08-08 19:12:48 +0000
15+++ src/PolkitDialog.vala 2016-08-10 00:00:44 +0000
16@@ -1,6 +1,6 @@
17 /*-
18 * Copyright (c) 2015-2016 elementary LLC.
19- * Copyright (C) 2015-2016 Ikey Doherty <ikey@solus-project.com>
20+ * Copyright (C) 2015-2016 Ikey Doherty <ikey@solus-project.com>
21 *
22 * This program is free software: you can redistribute it and/or modify
23 * it under the terms of the GNU Lesser General Public License as published by
24@@ -49,7 +49,7 @@
25
26 public PolkitDialog (string message, string icon_name, string _cookie,
27 List<Polkit.Identity?>? _idents, GLib.Cancellable _cancellable) {
28- Object (title: "", window_position: Gtk.WindowPosition.CENTER, resizable: false, deletable: false, skip_taskbar_hint: true);
29+ Object (title: _("Authentication Dialog"), window_position: Gtk.WindowPosition.CENTER, resizable: false, deletable: false, skip_taskbar_hint: true);
30 idents = _idents;
31 cookie = _cookie;
32 cancellable = _cancellable;
33@@ -87,7 +87,7 @@
34 var render = new Gtk.CellRendererText ();
35 idents_combo.pack_start (render, true);
36 idents_combo.add_attribute (render, "text", 0);
37- idents_combo.set_id_column (0);
38+ idents_combo.set_id_column (0);
39
40 identity_label = new Gtk.Label (_("Identity:"));
41 identity_label.halign = Gtk.Align.END;
42@@ -97,7 +97,7 @@
43 credentials_grid.row_spacing = 6;
44 credentials_grid.margin_top = 12;
45 credentials_grid.attach (identity_label, 0, 0, 1, 1);
46- credentials_grid.attach (idents_combo, 1, 0, 1, 1);
47+ credentials_grid.attach (idents_combo, 1, 0, 1, 1);
48 credentials_grid.attach (password_label, 0, 2, 1, 1);
49 credentials_grid.attach (password_entry, 1, 2, 1, 1);
50 credentials_grid.attach (feedback_revealer, 0, 3, 2, 1);

Subscribers

People subscribed via source and target branches