Mercurial > pidgin
changeset 369:cf895313fc50
[gaim-migrate @ 379]
Nothing interesting
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 09 Jun 2000 08:06:22 +0000 |
| parents | 9bf1f77985d2 |
| children | 5842aa11ab78 |
| files | configure.in gaim.spec.in plugins/Makefile.am src/aim.c src/oscar.c src/toc.c |
| diffstat | 6 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Fri Jun 09 07:59:00 2000 +0000 +++ b/configure.in Fri Jun 09 08:06:22 2000 +0000 @@ -17,7 +17,7 @@ dnl Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) +AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h locale.h) AC_CHECK_HEADERS(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not found ***])) dnl Checks for typedefs, structures, and compiler characteristics. @@ -39,6 +39,7 @@ AC_ARG_ENABLE(oscar, [ --enable-oscar Enable Oscar support (experimental)],enable_oscar=yes,) AC_ARG_ENABLE(nas, [ --enable-nas Enable NAS (Network Audio System) support],enable_nas=yes,) AC_ARG_ENABLE(plugins, [ --disable-plugins compile with out plugin support],enable_plugins=no,enable_plugins=yes) +AM_CONDITIONAL(PLUGINS, test x$enable_plugins = xyes) LIBFAIM_DO=""
--- a/gaim.spec.in Fri Jun 09 07:59:00 2000 +0000 +++ b/gaim.spec.in Fri Jun 09 08:06:22 2000 +0000 @@ -44,6 +44,7 @@ %attr(755,root,root) %{prefix}/bin/gaim %doc doc/the_penguin.txt doc/PROTOCOL doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README README.plugins ChangeLog %{prefix}/lib/gaim/* +%{prefix}/share/locale/*/*/* %{prefix}/share/pixmaps/gaim.xpm %{prefix}/share/gnome/apps/Internet/gaim.desktop %clean
--- a/plugins/Makefile.am Fri Jun 09 07:59:00 2000 +0000 +++ b/plugins/Makefile.am Fri Jun 09 08:06:22 2000 +0000 @@ -7,9 +7,11 @@ LDFLAGS += -ggdb $(GTK_LIBS) -shared .c.so: $(CC) $(CFLAGS) -fPIC -DPIC -o $@ $< $(LDFLAGS) +if PLUGINS plugin_DATA = autorecon.so iconaway.so notify.so spellchk.so plugindir = $(libdir)/gaim -clean: +clean distclean clean-recursive distclean-recursive: $(RM) $(plugin_DATA) +endif EXTRA_DIST = CRAZY HOWTO SIGNALS autorecon.c filectl.c gaiminc.c \ iconaway.c lagmeter.c notify.c simple.c spellchk.c toc_commands.c
--- a/src/aim.c Fri Jun 09 07:59:00 2000 +0000 +++ b/src/aim.c Fri Jun 09 08:06:22 2000 +0000 @@ -475,6 +475,12 @@ int main(int argc, char *argv[]) { +#ifdef ENABLE_NLS + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +#endif + #ifdef USE_APPLET init_applet_mgr(argc, argv); #elif defined USE_THEMES @@ -483,10 +489,6 @@ gtk_init(&argc, &argv); #endif /* USE_THEMES */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - set_defaults(); load_prefs();
--- a/src/oscar.c Fri Jun 09 07:59:00 2000 +0000 +++ b/src/oscar.c Fri Jun 09 08:06:22 2000 +0000 @@ -46,7 +46,8 @@ static int paspa = -1; struct aim_session_t *gaim_sess; struct aim_conn_t *gaim_conn; -int gaim_caps = AIM_CAPS_CHAT | AIM_CAPS_SENDFILE | AIM_CAPS_GETFILE; +int gaim_caps = AIM_CAPS_CHAT | AIM_CAPS_SENDFILE | AIM_CAPS_GETFILE | + AIM_CAPS_VOICE | AIM_CAPS_IMIMAGE | AIM_CAPS_BUDDYICON; GList *oscar_chats = NULL; @@ -562,6 +563,8 @@ /* libfaim won't tell us that we got this just yet */ } else if (rendtype == AIM_RENDEZVOUS_FILETRANSFER_GET) { /* nor will it tell us this. but it's still there */ + } else if (rendtype == AIM_RENDEZVOUS_VOICE) { + /* this one libfaim tells us unuseful info about */ } else { sprintf(debug_buff, "Unknown rendtype %d\n", rendtype); debug_print(debug_buff);
--- a/src/toc.c Fri Jun 09 07:59:00 2000 +0000 +++ b/src/toc.c Fri Jun 09 08:06:22 2000 +0000 @@ -686,8 +686,10 @@ g_free(messages[i]); accept_file_dialog(ft); + } else if (!strcmp(uuid, VOICE_UID)) { + /* oh goody. voice over ip. fun stuff. */ + /* - } else if (!strcmp(uuid, VOICE_UID)) { } else if (!strcmp(uuid, B_ICON_UID)) { } else if (!strcmp(uuid, IMAGE_UID)) { */