← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to src/gnome-ask-password-agent.vala

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome-ask-password-agent.vala
37
37
                set_default_response(ResponseType.OK);
38
38
                set_icon_name(icon);
39
39
 
40
 
#if LIBNOTIFY07
41
40
                add_button(Stock.CANCEL, ResponseType.CANCEL);
42
41
                add_button(Stock.OK, ResponseType.OK);
43
 
#else
44
 
                add_button(STOCK_CANCEL, ResponseType.CANCEL);
45
 
                add_button(STOCK_OK, ResponseType.OK);
46
 
#endif
47
42
 
48
43
                Container content = (Container) get_content_area();
49
44
 
190
185
 
191
186
                set_visible(true);
192
187
 
193
 
#if LIBNOTIFY07
194
188
                Notification n = new Notification(title, message, icon);
195
 
#else
196
 
                Notification n = new Notification(title, message, icon, null);
197
 
                n.attach_to_status_icon(this);
198
 
#endif
199
189
                n.set_timeout(5000);
200
190
                n.show();
201
191