Mercurial > pidgin.yaz
diff pidgin/Makefile.am @ 26329:f5e613e05332
Applied disco-2.patch from nops with some modifications:
* Alphabetized includes and Makefiles
* Removed purple_disco_set_ui_ops(NULL) in finch; ops is NULL by default.
* A few string changes
* Removed DISCO_PREF_LAST_SERVER. Default to our server, but store
the last requested in the JabberStream* and use it if available.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 29 Mar 2009 19:29:22 +0000 |
parents | c0e3b62f8098 |
children | b290c7b9fc73 |
line wrap: on
line diff
--- a/pidgin/Makefile.am Sat Mar 28 16:58:32 2009 +0000 +++ b/pidgin/Makefile.am Sun Mar 29 19:29:22 2009 +0000 @@ -90,6 +90,7 @@ gtkconv.c \ gtkdebug.c \ gtkdialogs.c \ + gtkdisco.c \ gtkdnd-hints.c \ gtkdocklet.c \ gtkdocklet-x11.c \ @@ -148,6 +149,7 @@ gtkconvwin.h \ gtkdebug.h \ gtkdialogs.h \ + gtkdisco.h \ gtkdnd-hints.h \ gtkdocklet.h \ gtkeventloop.h \