Mercurial > pidgin
changeset 11903:c9312177821a
[gaim-migrate @ 14194]
"make distcheck" fixes - mostly fixing DBUS things so they can
compile outside the source tree, and a few compile warning fixes.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 30 Oct 2005 17:24:38 +0000 |
| parents | 391acec18e46 |
| children | d72ecdba2322 |
| files | configure.ac plugins/Makefile.am plugins/mono/Makefile.am plugins/musicmessaging/Makefile.am src/Makefile.am src/dbus-server.c src/dbus-server.h src/dbus-useful.c src/gaim-client-example.c src/server.c |
| diffstat | 10 files changed, 41 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Oct 30 17:23:15 2005 +0000 +++ b/configure.ac Sun Oct 30 17:24:38 2005 +0000 @@ -418,12 +418,11 @@ if test "x$enable_dbus" = "xyes" ; then AC_MSG_CHECKING([location of the D-BUS session directory]) if ! test -z "$with_dbus_session_dir"; then - if ! test -d "$with_dbus_session_dir"; then - AC_MSG_WARN([$with_dbus_session_dir does not exist, if this is the correct location please make sure that it exists.]) - enable_dbus=no - fi - - DBUS_SESSION_DIR="$with_dbus_session_dir" + if ! test -d "$with_dbus_session_dir"; then + AC_MSG_WARN([$with_dbus_session_dir does not exist, if this is the correct location please make sure that it exists.]) + enable_dbus=no + fi + DBUS_SESSION_DIR="$with_dbus_session_dir" else dnl # add more to this as needed servicesprefixes="$DATADIR $LIBDIR /usr/share /usr/local/share" @@ -442,8 +441,6 @@ enable_dbus=no fi fi - - fi if test "x$enable_dbus" = "xyes" ; then
--- a/plugins/Makefile.am Sun Oct 30 17:23:15 2005 +0000 +++ b/plugins/Makefile.am Sun Oct 30 17:24:38 2005 +0000 @@ -90,8 +90,8 @@ $(top_builddir)/src/dbus-types.h: always cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F) -dbus-example-bindings.c: $(top_srcdir)/src/dbus-analyze-functions.py $(dbus_example_la_SOURCES) $(dbus_example_la_HEADERS) - cat $(dbus_example_la_SOURCES) $(dbus_example_la_HEADERS) | \ +dbus-example-bindings.c: $(top_srcdir)/src/dbus-analyze-functions.py $(dbus_example_la_SOURCES) + cat $(srcdir)/$(dbus_example_la_SOURCES) | \ $(PYTHON) $(top_srcdir)/src/dbus-analyze-functions.py --export-only > $@ $(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/src/dbus-types.h @@ -105,9 +105,14 @@ ChangeLog HOWTO \ ChangeLog.API \ Makefile.mingw \ + contact_priority.c \ filectl.c \ fortuneprofile.pl \ gaim.pl \ + gaiminc.c \ + gtk-signals-test.c \ + ipc-test-client.c \ + ipc-test-server.c \ mailchk.c \ pluginpref_example.c \ raw.c \ @@ -117,6 +122,7 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ + -I$(top_builddir)/src \ -I$(top_srcdir)/src \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \
--- a/plugins/mono/Makefile.am Sun Oct 30 17:23:15 2005 +0000 +++ b/plugins/mono/Makefile.am Sun Oct 30 17:24:38 2005 +0000 @@ -13,7 +13,7 @@ SUFFIXES = .cs .dll .cs.dll: api/GaimAPI.dll $(mono_build_sources) - mcs -t:library -lib:./api -out:$@ -r:GaimAPI.dll $(addprefix $(srcdir)/, $<) + mcs -t:library -lib:./api -out:$@ -r:GaimAPI.dll $< clean-local: rm -f $(mono_SCRIPTS)
--- a/plugins/musicmessaging/Makefile.am Sun Oct 30 17:23:15 2005 +0000 +++ b/plugins/musicmessaging/Makefile.am Sun Oct 30 17:24:38 2005 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ music.png -plugindir = $(libdir)/gaim +musicmessagingdir = $(libdir)/gaim musicmessaging_la_LDFLAGS = -module -avoid-version $(GTK_LIBS) $(DBUS_LIBS) @@ -10,7 +10,7 @@ musicmessagingpixdir = $(datadir)/pixmaps/gaim/buttons musicmessagingpix_DATA = music.png -plugin_LTLIBRARIES = musicmessaging.la +musicmessaging_LTLIBRARIES = musicmessaging.la musicmessaging_la_SOURCES = \ musicmessaging.c @@ -24,9 +24,9 @@ $(top_builddir)/src/dbus-types.h: always cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F) -music-messaging-bindings.c: ../../src/dbus-analyze-functions.py $(musicmessaging_la_SOURCES) $(musicmessaging_la_HEADERS) - cat $(musicmessaging_la_SOURCES) $(musicmessaging_la_HEADERS) | \ - $(PYTHON) ../../src/dbus-analyze-functions.py --export-only > $@ +music-messaging-bindings.c: $(top_srcdir)/src/dbus-analyze-functions.py $(musicmessaging_la_SOURCES) + cat $(srcdir)/$(musicmessaging_la_SOURCES) | \ + $(PYTHON) $(top_srcdir)/src/dbus-analyze-functions.py --export-only > $@ $(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/src/dbus-types.h @@ -37,6 +37,7 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DVERSION=\"$(VERSION)\" \ + -I$(top_builddir)/src \ -I$(top_srcdir)/src \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \
--- a/src/Makefile.am Sun Oct 30 17:23:15 2005 +0000 +++ b/src/Makefile.am Sun Oct 30 17:24:38 2005 +0000 @@ -165,19 +165,21 @@ # gaim dbus server dbus_sources = dbus-server.c dbus-useful.c -dbus_headers = dbus-bindings.h dbus-gaim.h dbus-server.h dbus-useful.h +dbus_headers = dbus-bindings.h dbus-gaim.h dbus-server.h dbus-useful.h dbus-define-api.h dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h connection.h conversation.h core.h roomlist.h status.h server.h +gaim_build_coreheaders = $(addprefix $(srcdir)/, $(gaim_coreheaders)) +dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported)) dbus-types.c: dbus-analyze-types.py $(gaim_coreheaders) - cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --pattern=GAIM_DBUS_DEFINE_TYPE\(%s\) > $@ + cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=GAIM_DBUS_DEFINE_TYPE\(%s\) > $@ dbus-types.h: dbus-analyze-types.py $(dbus_coreheaders) - cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --pattern=GAIM_DBUS_DECLARE_TYPE\(%s\) > $@ + cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=GAIM_DBUS_DECLARE_TYPE\(%s\) > $@ dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported) - cat $(dbus_exported) | $(PYTHON) dbus-analyze-functions.py > $@ + cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@ dbus-server.$(OBJEXT): dbus-bindings.c dbus-types.c dbus-types.h $(gaim_OBJECTS): dbus-types.h @@ -189,11 +191,11 @@ libgaim_client_la_SOURCES = gaim-client.c gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) - cat $(dbus_exported) | $(PYTHON) dbus-analyze-functions.py --client > $@ + cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@ gaim-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(gaim_coreheaders) $(dbus_exported) - cat $(gaim_coreheaders) | $(PYTHON) dbus-analyze-types.py --keyword=enum --verbatim > $@ - cat $(dbus_exported) | $(PYTHON) dbus-analyze-functions.py --client --headers >> $@ + cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@ + cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@ $(libgaim_client_la_OBJECTS): gaim-client-bindings.h gaim-client-bindings.c
--- a/src/dbus-server.c Sun Oct 30 17:23:15 2005 +0000 +++ b/src/dbus-server.c Sun Oct 30 17:24:38 2005 +0000 @@ -564,6 +564,7 @@ if (dbus_error_is_set (&error)) { dbus_connection_unref(gaim_dbus_connection); dbus_error_free(&error); + gaim_dbus_connection = NULL; gaim_debug_error("dbus", "Failed to get serv name: %s\n", error.name); return FALSE; } @@ -668,14 +669,20 @@ #undef my_arg -void gaim_dbus_signal_emit_gaim(char *name, int num_values, +void gaim_dbus_signal_emit_gaim(const char *name, int num_values, GaimValue **values, va_list vargs) { DBusMessage *signal; DBusMessageIter iter; char *newname; +#if 0 /* this is noisy with no dbus connection */ g_return_if_fail(gaim_dbus_connection); +#else + if (gaim_dbus_connection == NULL) + return; +#endif + /* The test below is a hack that prevents our "dbus-method-called" signal from being propagated to dbus. What we really need is a
--- a/src/dbus-server.h Sun Oct 30 17:23:15 2005 +0000 +++ b/src/dbus-server.h Sun Oct 30 17:24:38 2005 +0000 @@ -131,7 +131,7 @@ the types of the parameters. @param vargs A va_list containing the actual parameters. */ -void gaim_dbus_signal_emit_gaim(char *name, int num_values, +void gaim_dbus_signal_emit_gaim(const char *name, int num_values, GaimValue **values, va_list vargs); /**
--- a/src/dbus-useful.c Sun Oct 30 17:23:15 2005 +0000 +++ b/src/dbus-useful.c Sun Oct 30 17:24:38 2005 +0000 @@ -10,7 +10,7 @@ gaim_accounts_find_ext(const char *name, const char *protocol_id, gboolean (*account_test)(const GaimAccount *account)) { - GList *result = NULL; + GaimAccount *result = NULL; GList *l; char *who;