Mercurial > pidgin
changeset 11862:f8cd06753755
[gaim-migrate @ 14153]
Make "make distcheck" work, which also makes the perl plugin loader loadable
when installed to a non-standard prefix (it still can't find Gaim.pm though)
Add some extra warning CFLAGS if a) --enable-debug was used and b) your
compiler supports them.
Plug a couple of leaks
The gaimrc plugin's GtkTreeView expander_size setting now works (but doesn't
seem to instant-apply - should it?)
staticify some functions that don't need to be exposed
probably something else I forgot about
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 27 Oct 2005 20:43:43 +0000 |
| parents | 83e2fa10df1c |
| children | 2a9b00168cd6 |
| files | ChangeLog Makefile.am configure.ac plugins/Makefile.am plugins/gaimrc.c plugins/perl/Makefile.am plugins/perl/libgaimperl.c src/gtkimhtmltoolbar.c src/protocols/msn/notification.c src/protocols/sametime/Makefile.am src/session.c |
| diffstat | 11 files changed, 44 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 27 20:22:27 2005 +0000 +++ b/ChangeLog Thu Oct 27 20:43:43 2005 +0000 @@ -54,6 +54,7 @@ (Peter McCurdy) * Control-Shift-Tab will reverse cycle through the conversation tabs (James Vega) + * Mono plugin loader (Eoin Coffey) Bug fixes: * People using input methods can now use Enter again.
--- a/Makefile.am Thu Oct 27 20:22:27 2005 +0000 +++ b/Makefile.am Thu Oct 27 20:43:43 2005 +0000 @@ -48,3 +48,9 @@ @echo "doxygen was not found during configure. Aborting." @echo; endif + +# perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which +# breaks "make distcheck" unless we ignore perl things + +distuninstallcheck_listfiles = \ + find . -type f -print | grep -v perl
--- a/configure.ac Thu Oct 27 20:22:27 2005 +0000 +++ b/configure.ac Thu Oct 27 20:43:43 2005 +0000 @@ -239,7 +239,7 @@ AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") AC_SUBST(STATIC_LINK_LIBS) -AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto }, +AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init() { $load_proto }, [Loads static protocol plugin module initialization functions.]) AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) @@ -307,6 +307,19 @@ if test "$enable_debug" = yes ; then AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.]) + for newflag in "-Werror-implicit-function-declaration" "-Wdeclaration-after-statement"; do + orig_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $newflag" + AC_MSG_CHECKING(for $newflag option to gcc) + AC_TRY_COMPILE([], [ + void main() {}; + ], [ + AC_MSG_RESULT(yes) + ], [ + AC_MSG_RESULT(no) + CFLAGS="$orig_CFLAGS" + ]) + done fi if test "x$enable_deprecated" = no; then
--- a/plugins/Makefile.am Thu Oct 27 20:22:27 2005 +0000 +++ b/plugins/Makefile.am Thu Oct 27 20:43:43 2005 +0000 @@ -27,12 +27,12 @@ docklet \ $(GEVOLUTION_DIR) \ gestures \ + $(MONO_DIR) \ + $(MUSICMESSAGING_DIR) \ $(PERL_DIR) \ ssl \ $(TCL_DIR) \ - ticker \ - $(MUSICMESSAGING_DIR) \ - $(MONO_DIR) + ticker plugindir = $(libdir)/gaim
--- a/plugins/gaimrc.c Thu Oct 27 20:22:27 2005 +0000 +++ b/plugins/gaimrc.c Thu Oct 27 20:43:43 2005 +0000 @@ -110,7 +110,7 @@ if (gaim_prefs_get_bool(widget_size_prefs_set[i])) { prefbase = g_path_get_basename(widget_size_prefs[i]); g_string_append_printf(style_string, - "%s = \"%d\"\n", prefbase, + "%s = %d\n", prefbase, gaim_prefs_get_int(widget_size_prefs[i])); g_free(prefbase); } @@ -166,6 +166,7 @@ if (value) gaimrc_make_changes(); g_string_free(style_string, TRUE); + g_free(prefbase); return; } else {
--- a/plugins/perl/Makefile.am Thu Oct 27 20:22:27 2005 +0000 +++ b/plugins/perl/Makefile.am Thu Oct 27 20:43:43 2005 +0000 @@ -2,10 +2,10 @@ perl_dirs = common -plugin_LTLIBRARIES = perl.la +plugin_LTLIBRARIES = perl.la libgaimperl.la perl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) $(PERL_LIBS) -perl_la_LIBADD = $(PERL_LIBS) -L. -lgaimperl +perl_la_LIBADD = $(PERL_LIBS) -L.libs -lgaimperl perl_la_SOURCES = \ perl.c \ perl-common.c \ @@ -16,10 +16,10 @@ perl_la_DEPENDENCIES = \ .libs/libperl_orig.a \ .libs/DynaLoader.a \ - libgaimperl.so + libgaimperl.la -libgaimperl.so: - $(CC) -shared -fPIC -olibgaimperl.so libgaimperl.c +libgaimperl_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) +libgaimperl_la_SOURCES = libgaimperl.c .libs/libperl_orig.a: @mkdir -p .libs @@ -114,9 +114,9 @@ $(MAKE) install; \ cd ..; \ done - cp libgaimperl.so $(libdir) # Evil Hack (TM) +# ... which doesn't work with DESTDIR installs. FIXME? uninstall-local: @for dir in $(perl_dirs); do \ cd $$dir && \
--- a/plugins/perl/libgaimperl.c Thu Oct 27 20:22:27 2005 +0000 +++ b/plugins/perl/libgaimperl.c Thu Oct 27 20:43:43 2005 +0000 @@ -1,3 +1,4 @@ +#include <gmodule.h> void __attribute__ ((constructor)) my_init(void) { /* Very evil hack...puts perl.so's symbols in the global table */ /* but does not create a circular dependancy because g_module_open */
--- a/src/gtkimhtmltoolbar.c Thu Oct 27 20:22:27 2005 +0000 +++ b/src/gtkimhtmltoolbar.c Thu Oct 27 20:43:43 2005 +0000 @@ -579,7 +579,7 @@ struct smiley_button_list *next; }; -struct smiley_button_list * +static struct smiley_button_list * sort_smileys(struct smiley_button_list *ls, GtkIMHtmlToolbar *toolbar, int *width, char *filename, char *face) { GtkWidget *image;
--- a/src/protocols/msn/notification.c Thu Oct 27 20:22:27 2005 +0000 +++ b/src/protocols/msn/notification.c Thu Oct 27 20:43:43 2005 +0000 @@ -523,9 +523,13 @@ reason = g_strdup_printf(_("%s is not a valid passport account."), passport); } + else if (error == 500) + { + reason = g_strdup(_("Service Temporarily Unavailable.")); + } else { - reason = g_strdup_printf(_("Unknown error.")); + reason = g_strdup(_("Unknown error.")); } }
--- a/src/protocols/sametime/Makefile.am Thu Oct 27 20:22:27 2005 +0000 +++ b/src/protocols/sametime/Makefile.am Thu Oct 27 20:43:43 2005 +0000 @@ -36,7 +36,7 @@ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS) \ -I$(top_srcdir)/src \ - -Imeanwhile + -I$(top_srcdir)/src/protocols/sametime/meanwhile AM_CPPFLAGS = \
--- a/src/session.c Thu Oct 27 20:22:27 2005 +0000 +++ b/src/session.c Thu Oct 27 20:43:43 2005 +0000 @@ -165,7 +165,7 @@ /* SM callback handlers */ -void session_save_yourself(SmcConn conn, SmPointer data, int save_type, +static void session_save_yourself(SmcConn conn, SmPointer data, int save_type, Bool shutdown, int interact_style, Bool fast) { if (had_first_save == FALSE && save_type == SmSaveLocal && interact_style == SmInteractStyleNone && !shutdown && @@ -192,18 +192,18 @@ SmcSaveYourselfDone(conn, True); } -void session_die(SmcConn conn, SmPointer data) { +static void session_die(SmcConn conn, SmPointer data) { gaim_debug(GAIM_DEBUG_INFO, "Session Management", "Received die\n"); gaim_core_quit(); } -void session_save_complete(SmcConn conn, SmPointer data) { +static void session_save_complete(SmcConn conn, SmPointer data) { gaim_debug(GAIM_DEBUG_INFO, "Session Management", "Received save_complete\n"); } -void session_shutdown_cancelled(SmcConn conn, SmPointer data) { +static void session_shutdown_cancelled(SmcConn conn, SmPointer data) { gaim_debug(GAIM_DEBUG_INFO, "Session Management", "Received shutdown_cancelled\n"); }