Attachment #257922 for bug #318365

Lines 962-968 systemd_gnome_ask_password_agent_VALAFLAGS = \ Link Here

(-)a/Makefile.am (-1 / +6 lines)
962	--pkg=gtk+-2.0 \	962	--pkg=gtk+-2.0 \
963	--pkg=linux \	963	--pkg=linux \
964	--pkg=gio-unix-2.0 \	964	--pkg=gio-unix-2.0 \
965	--pkg=libnotify \	965	--pkg=libnotify
		966	if LIBNOTIFY07
		967	systemd_gnome_ask_password_agent_VALAFLAGS += \
		968	-D LIBNOTIFY07
		969	endif
		970	systemd_gnome_ask_password_agent_VALAFLAGS += \
966	-g	971	-g
967		972
968	systemd_gnome_ask_password_agent_LDADD = \	973	systemd_gnome_ask_password_agent_LDADD = \

Lines 259-270 if test "$have_gtk" = "yes"; then Link Here

(-)a/configure.ac (-2 / +5 lines)
259	AC_SUBST(DBUSGLIB_CFLAGS)	259	AC_SUBST(DBUSGLIB_CFLAGS)
260	AC_SUBST(DBUSGLIB_LIBS)	260	AC_SUBST(DBUSGLIB_LIBS)
261		261
262	PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ])	262	PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
		263	PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
		264
263	AC_SUBST(LIBNOTIFY_CFLAGS)	265	AC_SUBST(LIBNOTIFY_CFLAGS)
264	AC_SUBST(LIBNOTIFY_LIBS)	266	AC_SUBST(LIBNOTIFY_LIBS)
265	fi	267	fi
		268	AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
266		269
267	AM_PROG_VALAC([0.11])	270	AM_PROG_VALAC([0.10])
268	AC_SUBST(VAPIDIR)	271	AC_SUBST(VAPIDIR)
269	AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)	272	AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
270		273

Lines 38-45 public class PasswordDialog : Dialog { Link Here

(-)a/src/gnome-ask-password-agent.vala (+14 lines)
38	set_default_response(ResponseType.OK);	38	set_default_response(ResponseType.OK);
39	set_icon_name(icon);	39	set_icon_name(icon);
40		40
		41	#if LIBNOTIFY07
41	add_button(Stock.CANCEL, ResponseType.CANCEL);	42	add_button(Stock.CANCEL, ResponseType.CANCEL);
42	add_button(Stock.OK, ResponseType.OK);	43	add_button(Stock.OK, ResponseType.OK);
		44	#else
		45	add_button(STOCK_CANCEL, ResponseType.CANCEL);
		46	add_button(STOCK_OK, ResponseType.OK);
		47	#endif
43		48
44	Container content = (Container) get_content_area();	49	Container content = (Container) get_content_area();
45		50
Lines 181-187 public class MyStatusIcon : StatusIcon { Link Here
181		186
182	set_visible(true);	187	set_visible(true);
183		188
		189	#if LIBNOTIFY07
184	Notification n = new Notification(title, message, icon);	190	Notification n = new Notification(title, message, icon);
		191	#else
		192	Notification n = new Notification(title, message, icon, null);
		193	n.attach_to_status_icon(this);
		194	#endif
185	n.set_timeout(5000);	195	n.set_timeout(5000);
186	n.show();	196	n.show();
187		197
Lines 225-231 public class MyStatusIcon : StatusIcon { Link Here
225		235
226	OutputStream stream = new UnixOutputStream(to_process, true);	236	OutputStream stream = new UnixOutputStream(to_process, true);
227		237
		238	#if LIBNOTIFY07
228	stream.write(password.data, null);	239	stream.write(password.data, null);
		240	#else
		241	stream.write(password, password.length, null);
		242	#endif
229	}	243	}
230	}	244	}
231		245

Return to bug 318365