chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnome-ask-password-agent: also support libnotify < 0.7 for now
[elogind.git]
/
src
/
gnome-ask-password-agent.vala
diff --git
a/src/gnome-ask-password-agent.vala
b/src/gnome-ask-password-agent.vala
index 1523e2e3bef16d805a6845d795085399a5c294c4..61bbba0f7c8b9077b3163109c7384a2e844609c5 100644
(file)
--- a/
src/gnome-ask-password-agent.vala
+++ b/
src/gnome-ask-password-agent.vala
@@
-38,8
+38,13
@@
public class PasswordDialog : Dialog {
set_default_response(ResponseType.OK);
set_icon_name(icon);
set_default_response(ResponseType.OK);
set_icon_name(icon);
+#if LIBNOTIFY07
+ add_button(Stock.CANCEL, ResponseType.CANCEL);
+ add_button(Stock.OK, ResponseType.OK);
+#else
add_button(STOCK_CANCEL, ResponseType.CANCEL);
add_button(STOCK_OK, ResponseType.OK);
add_button(STOCK_CANCEL, ResponseType.CANCEL);
add_button(STOCK_OK, ResponseType.OK);
+#endif
Container content = (Container) get_content_area();
Container content = (Container) get_content_area();
@@
-181,8
+186,12
@@
public class MyStatusIcon : StatusIcon {
set_visible(true);
set_visible(true);
+#if LIBNOTIFY07
+ Notification n = new Notification(title, message, icon);
+#else
Notification n = new Notification(title, message, icon, null);
n.attach_to_status_icon(this);
Notification n = new Notification(title, message, icon, null);
n.attach_to_status_icon(this);
+#endif
n.set_timeout(5000);
n.show();
n.set_timeout(5000);
n.show();
@@
-226,7
+235,11
@@
public class MyStatusIcon : StatusIcon {
OutputStream stream = new UnixOutputStream(to_process, true);
OutputStream stream = new UnixOutputStream(to_process, true);
+#if LIBNOTIFY07
+ stream.write(password.data, null);
+#else
stream.write(password, password.length, null);
stream.write(password, password.length, null);
+#endif
}
}
}
}