Commits October 2008

commits@gajim.org

5 participants
128 discussions

[commit-gajim] r10482 - trunk
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 17:01:36 +0200 (Sun, 05 Oct 2008) New Revision: 10482 Modified: trunk/gajim.nsi Log: Partly fix issues from #4193. Modified: trunk/gajim.nsi =================================================================== --- trunk/gajim.nsi 2008-10-05 10:21:41 UTC (rev 10481) +++ trunk/gajim.nsi 2008-10-05 15:01:36 UTC (rev 10482) @@ -51,9 +51,11 @@ LangString NAME_Languages ${LANG_ENGLISH} "Languages" LangString NAME_SecLanguagesOther ${LANG_ENGLISH} "Other" LangString NAME_Themes ${LANG_ENGLISH} "Themes" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." ; French TODO: TRANSLATE! @@ -62,9 +64,11 @@ LangString NAME_Languages ${LANG_FRENCH} "Langues" LangString NAME_SecLanguagesOther ${LANG_FRENCH} "Autre" LangString NAME_Themes ${LANG_FRENCH} "Th�mes" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au d�marrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (n�cessaire � Gajim)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ�, Gajim sera automatiquement lanc� au d�marrage de Windows." ; German @@ -73,9 +77,11 @@ LangString NAME_Languages ${LANG_GERMAN} "Sprachen" LangString NAME_SecLanguagesOther ${LANG_GERMAN} "Sonstige" LangString NAME_Themes ${LANG_GERMAN} "Designs" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Wenn dies aktiviert wird, wird ein Icon f�r Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." ; Italian TODO: TRANSLATE! @@ -84,9 +90,11 @@ LangString NAME_Languages ${LANG_ITALIAN} "Languages" LangString NAME_SecLanguagesOther ${LANG_ITALIAN} "Other" LangString NAME_Themes ${LANG_ITALIAN} "Themes" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_ITALIAN} "Installs the main Gajim files." LangString DESC_SecGtk ${LANG_ITALIAN} "Installs Gtk+ 2 (necessary to run Gajim)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "If set, Gajim will be automatically started when Windows starts." ; Spanish TODO: TRANSLATE! @@ -95,9 +103,11 @@ LangString NAME_Languages ${LANG_SPANISH} "Languages" LangString NAME_SecLanguagesOther ${LANG_SPANISH} "Other" LangString NAME_Themes ${LANG_THEMES} "Themes" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_SPANISH} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_SPANISH} "Installs the main Gajim files." LangString DESC_SecGtk ${LANG_SPANISH} "Installs Gtk+ 2 (necessary to run Gajim)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_SPANISH} "If set, Gajim will be automatically started when Windows starts." ; Russian TODO: TRANSLATE! @@ -106,9 +116,11 @@ LangString NAME_Languages ${LANG_RUSSIAN} "Languages" LangString NAME_SecLanguagesOther ${LANG_RUSSIAN} "Other" LangString NAME_Themes ${LANG_RUSSIAN} "Themes" +LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_RUSSIAN} "Installs the main Gajim files." LangString DESC_SecGtk ${LANG_RUSSIAN} "Installs Gtk+ 2 (necessary to run Gajim)." +LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_RUSSIAN} "If set, Gajim will be automatically started when Windows starts." Section "Gajim" SecGajim @@ -493,6 +505,12 @@ SectionGroupEnd +Section $(NAME_SecDesktopIcon) SecDesktopIcon + SetShellVarContext current + SetOutPath "$INSTDIR\bin" + CreateShortCut "$DESKTOP\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" +SectionEnd + Section $(NAME_SecAutostart) SecAutostart SetShellVarContext current SetOutPath "$INSTDIR\bin" @@ -744,6 +762,7 @@ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecGajim} $(DESC_SecGajim) !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} $(DESC_SecGtk) + !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(DESC_SecDesktopIcon) !insertmacro MUI_DESCRIPTION_TEXT ${SecAutostart} $(DESC_SecAutostart) !insertmacro MUI_FUNCTION_DESCRIPTION_END

1 0

[commit-gajim] r10481 - branches/osx_newbuildsys/src
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 12:21:41 +0200 (Sun, 05 Oct 2008) New Revision: 10481 Modified: branches/osx_newbuildsys/src/gajim.py Log: Fix #4375. Modified: branches/osx_newbuildsys/src/gajim.py =================================================================== --- branches/osx_newbuildsys/src/gajim.py 2008-10-05 10:21:35 UTC (rev 10480) +++ branches/osx_newbuildsys/src/gajim.py 2008-10-05 10:21:41 UTC (rev 10481) @@ -2460,7 +2460,7 @@ emoticons_pattern = '|' + \ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ - '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' + '(?:(?![\w]' + emoticons_pattern_postmatch[:-1] + '))' # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier

1 0

[commit-gajim] r10480 - trunk/src
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 12:21:35 +0200 (Sun, 05 Oct 2008) New Revision: 10480 Modified: trunk/src/gajim.py Log: Fix #4375. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-05 00:45:59 UTC (rev 10479) +++ trunk/src/gajim.py 2008-10-05 10:21:35 UTC (rev 10480) @@ -2453,7 +2453,7 @@ emoticons_pattern = '|' + \ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ - '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' + '(?:(?![\w]' + emoticons_pattern_postmatch[:-1] + '))' # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier

1 0

[commit-gajim] r10479 - in branches/osx_newbuildsys: scripts src/common src/common/idle_c src/spellmodule
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 02:45:59 +0200 (Sun, 05 Oct 2008) New Revision: 10479 Modified: branches/osx_newbuildsys/scripts/gajim-remote.in branches/osx_newbuildsys/scripts/gajim.in branches/osx_newbuildsys/src/common/configpaths.py branches/osx_newbuildsys/src/common/idle_c/Makefile branches/osx_newbuildsys/src/spellmodule/Makefile Log: Help gajim find its files when installed. Modified: branches/osx_newbuildsys/scripts/gajim-remote.in =================================================================== --- branches/osx_newbuildsys/scripts/gajim-remote.in 2008-10-05 00:31:22 UTC (rev 10478) +++ branches/osx_newbuildsys/scripts/gajim-remote.in 2008-10-05 00:45:59 UTC (rev 10479) @@ -24,9 +24,9 @@ exit 1 fi -libdir=@LIBDIR@ -PYTHON_EXEC=@PYTHON@ +libdir="@LIBDIR@" +PYTHON_EXEC="@PYTHON@" -cd ${datadir}/gajim -export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" -exec ${PYTHON_EXEC} -OO gajim-remote.py "$@" +cd "$libdir/gajim" +export PYTHONPATH="$PYTHONPATH:$libdir/gajim" +exec $PYTHON_EXEC gajim-remote.pyc "$@" Modified: branches/osx_newbuildsys/scripts/gajim.in =================================================================== --- branches/osx_newbuildsys/scripts/gajim.in 2008-10-05 00:31:22 UTC (rev 10478) +++ branches/osx_newbuildsys/scripts/gajim.in 2008-10-05 00:45:59 UTC (rev 10479) @@ -26,9 +26,10 @@ exit 1 fi -libdir=@LIBDIR@ -PYTHON_EXEC=@PYTHON@ +libdir="@LIBDIR@" +PYTHON_EXEC="@PYTHON@" -cd ${datadir}/gajim -export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" -exec ${PYTHON_EXEC} -OO gajim.py $@ +cd "$libdir/gajim" +export PYTHONPATH="$PYTHONPATH:$libdir/gajim" +export GAJIM_DATADIR="@DATADIR@/gajim" +exec $PYTHON_EXEC gajim.pyc $@ Modified: branches/osx_newbuildsys/src/common/configpaths.py =================================================================== --- branches/osx_newbuildsys/src/common/configpaths.py 2008-10-05 00:31:22 UTC (rev 10478) +++ branches/osx_newbuildsys/src/common/configpaths.py 2008-10-05 00:45:59 UTC (rev 10479) @@ -114,7 +114,10 @@ for n, p in zip(k, v): self.add_from_root(n, p) - self.add('DATA', os.path.join(u'..', windowsify(u'data'))) + if 'GAJIM_DATADIR' in os.environ: + self.add('DATA', fse(os.environ['GAJIM_DATADIR'])) + else: + self.add('DATA', os.path.join(u'..', windowsify(u'data'))) self.add('HOME', fse(os.path.expanduser('~'))) self.add('TMP', fse(tempfile.gettempdir())) Modified: branches/osx_newbuildsys/src/common/idle_c/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/idle_c/Makefile 2008-10-05 00:31:22 UTC (rev 10478) +++ branches/osx_newbuildsys/src/common/idle_c/Makefile 2008-10-05 00:45:59 UTC (rev 10479) @@ -7,6 +7,7 @@ include ../../../buildsys.mk include ../../../extra.mk -CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} LIBS += ${PYTHON_LIBS} ${XSCRNSAVER_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} Modified: branches/osx_newbuildsys/src/spellmodule/Makefile =================================================================== --- branches/osx_newbuildsys/src/spellmodule/Makefile 2008-10-05 00:31:22 UTC (rev 10478) +++ branches/osx_newbuildsys/src/spellmodule/Makefile 2008-10-05 00:45:59 UTC (rev 10479) @@ -5,6 +5,7 @@ include ../../buildsys.mk include ../../extra.mk -CFLAGS += ${PLUGIN_CFLAGS} ${PYTHON_CFLAGS} ${PYGTK_CFLAGS} ${GTKSPELL_CFLAGS} +CFLAGS += ${PLUGIN_CFLAGS} +CPPFLAGS += ${PYTHON_CFLAGS} ${PYGTK_CFLAGS} ${GTKSPELL_CFLAGS} LIBS += ${PYTHON_LIBS} ${PYGTK_LIBS} ${GTKSPELL_LIBS} LDFLAGS += ${PLUGIN_LDFLAGS} ${PYTHON_LDFLAGS}

1 0

[commit-gajim] r10478 - in branches/osx_newbuildsys: . m4
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 02:31:22 +0200 (Sun, 05 Oct 2008) New Revision: 10478 Modified: branches/osx_newbuildsys/buildsys.mk.in branches/osx_newbuildsys/m4/buildsys.m4 Log: Updated to newer version of the buildsys. Modified: branches/osx_newbuildsys/buildsys.mk.in =================================================================== --- branches/osx_newbuildsys/buildsys.mk.in 2008-10-05 00:30:31 UTC (rev 10477) +++ branches/osx_newbuildsys/buildsys.mk.in 2008-10-05 00:31:22 UTC (rev 10478) @@ -29,6 +29,7 @@ OBJC = @OBJC@ AR = @AR@ LD = ${CC} +RANLIB = @RANLIB@ PYTHON = @PYTHON@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ @@ -101,10 +102,22 @@ test -f .deps || regen=1; \ for i in ${SRCS}; do \ case $$i in \ - *.o) \ + *.c) \ test $$i -nt .deps && regen=1; \ - deps="$${deps%.o}.dep $$i"; \ + deps="$$deps $${i%.c}.dep"; \ ;; \ + *.cc) \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $${i%.cc}.dep"; \ + ;; \ + *.cxx) \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $${i%.cxx}.dep"; \ + ;; \ + *.m) \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $${i%.m}.dep"; \ + ;; \ esac; \ done; \ if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \ @@ -154,10 +167,11 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} - if ${AR} cr $@ ${OBJS}; then \ + if ${AR} cr $@ ${OBJS} && ${RANLIB} ${@}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ + rm -f $@; \ fi .c.o: Modified: branches/osx_newbuildsys/m4/buildsys.m4 =================================================================== --- branches/osx_newbuildsys/m4/buildsys.m4 2008-10-05 00:30:31 UTC (rev 10477) +++ branches/osx_newbuildsys/m4/buildsys.m4 2008-10-05 00:31:22 UTC (rev 10478) @@ -103,7 +103,7 @@ CLEAN_LIB='${LIB}.a' ;; *) - AC_MSG_RESULT(POSIX) + AC_MSG_RESULT(GNU) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}'

1 0

[commit-gajim] r10477 - in branches/osx_newbuildsys: . data data/activities data/emoticons data/emoticons/animated data/emoticons/static data/emoticons/static-big data/glade data/iconsets data/moods data/other data/pixmaps data/sounds scripts src src/common src/common/xmpp src/common/zeroconf src/osx src/osx/growl
by js＠gajim.org 05 Oct '08

05 Oct '08

Author: js Date: 2008-10-05 02:30:31 +0200 (Sun, 05 Oct 2008) New Revision: 10477 Added: branches/osx_newbuildsys/data/other/Makefile branches/osx_newbuildsys/scripts/Makefile Removed: branches/osx_newbuildsys/data/emoticons/animated/Makefile branches/osx_newbuildsys/data/emoticons/static-big/Makefile branches/osx_newbuildsys/data/emoticons/static/Makefile Modified: branches/osx_newbuildsys/Makefile branches/osx_newbuildsys/configure.ac branches/osx_newbuildsys/data/Makefile branches/osx_newbuildsys/data/activities/Makefile branches/osx_newbuildsys/data/emoticons/Makefile branches/osx_newbuildsys/data/glade/Makefile branches/osx_newbuildsys/data/iconsets/Makefile branches/osx_newbuildsys/data/moods/Makefile branches/osx_newbuildsys/data/pixmaps/Makefile branches/osx_newbuildsys/data/sounds/Makefile branches/osx_newbuildsys/scripts/gajim-remote.in branches/osx_newbuildsys/scripts/gajim.in branches/osx_newbuildsys/src/Makefile branches/osx_newbuildsys/src/common/Makefile branches/osx_newbuildsys/src/common/xmpp/Makefile branches/osx_newbuildsys/src/common/zeroconf/Makefile branches/osx_newbuildsys/src/osx/Makefile branches/osx_newbuildsys/src/osx/growl/Makefile Log: Install files - to the right place ;). Modified: branches/osx_newbuildsys/Makefile =================================================================== --- branches/osx_newbuildsys/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,3 @@ -SUBDIRS = data src po +SUBDIRS = data src po scripts include buildsys.mk Modified: branches/osx_newbuildsys/configure.ac =================================================================== --- branches/osx_newbuildsys/configure.ac 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/configure.ac 2008-10-05 00:30:31 UTC (rev 10477) @@ -13,6 +13,8 @@ AC_PROG_CC AC_PROG_OBJC AC_PROG_LN_S +AC_PROG_INSTALL +AM_PROG_INSTALL_SH AC_C_CONST AC_CHECK_HEADERS([libintl.h]) Modified: branches/osx_newbuildsys/data/Makefile =================================================================== --- branches/osx_newbuildsys/data/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,3 @@ -SUBDIRS = activities emoticons glade iconsets moods pixmaps sounds +SUBDIRS = activities emoticons glade iconsets moods other pixmaps sounds include ../buildsys.mk Modified: branches/osx_newbuildsys/data/activities/Makefile =================================================================== --- branches/osx_newbuildsys/data/activities/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/activities/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Install files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in */*/*.png; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/activities/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/activities/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/data/emoticons/Makefile =================================================================== --- branches/osx_newbuildsys/data/emoticons/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/emoticons/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -SUBDIRS = animated static static-big +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in */emoticons.py */*.png */*.gif; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/emoticons/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/emoticons/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Deleted: branches/osx_newbuildsys/data/emoticons/animated/Makefile =================================================================== --- branches/osx_newbuildsys/data/emoticons/animated/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/emoticons/animated/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +0,0 @@ -# FIXME: Install files - -include ../../../buildsys.mk Deleted: branches/osx_newbuildsys/data/emoticons/static/Makefile =================================================================== --- branches/osx_newbuildsys/data/emoticons/static/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/emoticons/static/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +0,0 @@ -# FIXME: Install files - -include ../../../buildsys.mk Deleted: branches/osx_newbuildsys/data/emoticons/static-big/Makefile =================================================================== --- branches/osx_newbuildsys/data/emoticons/static-big/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/emoticons/static-big/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +0,0 @@ -# FIXME: Install files - -include ../../../buildsys.mk Modified: branches/osx_newbuildsys/data/glade/Makefile =================================================================== --- branches/osx_newbuildsys/data/glade/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/glade/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Install files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in *.glade; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/glade && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/glade/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/data/iconsets/Makefile =================================================================== --- branches/osx_newbuildsys/data/iconsets/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/iconsets/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Install files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in */*/*.png */*/*/*.png; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/iconsets/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/iconsets/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/data/moods/Makefile =================================================================== --- branches/osx_newbuildsys/data/moods/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/moods/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Installl files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in */*.png; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/moods/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/moods/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Added: branches/osx_newbuildsys/data/other/Makefile =================================================================== --- branches/osx_newbuildsys/data/other/Makefile (rev 0) +++ branches/osx_newbuildsys/data/other/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -0,0 +1,11 @@ +include ../../buildsys.mk + +install-extra: + for i in *.pem *.xml; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/other && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/other/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/data/pixmaps/Makefile =================================================================== --- branches/osx_newbuildsys/data/pixmaps/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/pixmaps/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Install files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in *.bmp *.icns *.ico *.png agents/*.png events/*.png; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$(dirname $$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/data/sounds/Makefile =================================================================== --- branches/osx_newbuildsys/data/sounds/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/data/sounds/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -1,3 +1,11 @@ -# FIXME: Install files +include ../../buildsys.mk -include ../../buildsys.mk +install-extra: + for i in *.wav; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${datadir}/${PACKAGE}/sounds && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/sounds/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Added: branches/osx_newbuildsys/scripts/Makefile =================================================================== --- branches/osx_newbuildsys/scripts/Makefile (rev 0) +++ branches/osx_newbuildsys/scripts/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -0,0 +1,11 @@ +include ../buildsys.mk + +install-extra: + for i in gajim gajim-remote; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/scripts/gajim-remote.in =================================================================== --- branches/osx_newbuildsys/scripts/gajim-remote.in 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/scripts/gajim-remote.in 2008-10-05 00:30:31 UTC (rev 10477) @@ -24,9 +24,9 @@ exit 1 fi -datadir=@DATADIR@ +libdir=@LIBDIR@ PYTHON_EXEC=@PYTHON@ -cd ${datadir}/gajim/src +cd ${datadir}/gajim export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" exec ${PYTHON_EXEC} -OO gajim-remote.py "$@" Modified: branches/osx_newbuildsys/scripts/gajim.in =================================================================== --- branches/osx_newbuildsys/scripts/gajim.in 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/scripts/gajim.in 2008-10-05 00:30:31 UTC (rev 10477) @@ -26,9 +26,9 @@ exit 1 fi -datadir=@DATADIR@ +libdir=@LIBDIR@ PYTHON_EXEC=@PYTHON@ -cd ${datadir}/gajim/src +cd ${datadir}/gajim export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" exec ${PYTHON_EXEC} -OO gajim.py $@ Modified: branches/osx_newbuildsys/src/Makefile =================================================================== --- branches/osx_newbuildsys/src/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -49,9 +49,6 @@ include ../buildsys.mk -PACKAGE := ${PACKAGE}/src -DATA = ${OBJS} - all: ${OBJS} gtkspell.so trayicon.so # Don't depend on the actual file, we can create the symlink anyway @@ -61,3 +58,13 @@ trayicon.so: rm -f trayicon.so ln -s traymodule/trayicon.so trayicon.so + +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/src/common/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/common/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -40,12 +40,19 @@ include ../../buildsys.mk -PACKAGE := ${PACKAGE}/src/common -DATA = ${OBJS} - all: ${OBJS} idle.so # Don't depend on the actual file, we can create the symlink anyway idle.so: rm -f idle.so ln -s idle_c/idle.so idle.so + +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE}/common && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/common/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/src/common/xmpp/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/common/xmpp/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -23,7 +23,14 @@ include ../../../buildsys.mk -PACKAGE := ${PACKAGE}/src/common/xmpp -DATA = ${OBJS} +all: ${OBJS} -all: ${OBJS} +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE}/common/xmpp && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/common/xmpp/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/src/common/zeroconf/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/zeroconf/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/common/zeroconf/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -9,7 +9,14 @@ include ../../../buildsys.mk -PACKAGE := ${PACKAGE}/src/common/zeroconf -DATA = ${OBJS} +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE}/common/zeroconf && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/common/zeroconf/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done all: ${OBJS} Modified: branches/osx_newbuildsys/src/osx/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/osx/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -9,9 +9,6 @@ include ../../buildsys.mk -PACKAGE := ${PACKAGE}/src/osx -DATA = ${OBJS} - all: ${OBJS} idle.so nsapp.so # Don't depend on the actual file, we can create the symlink anyway @@ -21,3 +18,13 @@ nsapp.so: rm -f nsapp.so ln -s nsapp_m/nsapp.so nsapp.so + +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE}/osx && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/osx/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done Modified: branches/osx_newbuildsys/src/osx/growl/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/growl/Makefile 2008-10-04 23:51:19 UTC (rev 10476) +++ branches/osx_newbuildsys/src/osx/growl/Makefile 2008-10-05 00:30:31 UTC (rev 10477) @@ -6,9 +6,6 @@ include ../../../buildsys.mk -PACKAGE := ${PACKAGE}/osx/growl -DATA = ${OBJS} - all: ${OBJS} _growl.so _growlImage.so # Don't depend on the actual file, we can create the symlink anyway @@ -18,3 +15,13 @@ _growlImage.so: rm -f _growlImage.so ln -s growlImage_m/_growlImage.so _growlImage.so + +install-extra: + for i in ${OBJS}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir}/${PACKAGE}/osx/growl && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/${PACKAGE}/osx/growl/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done

1 0

[commit-gajim] r10476 - branches/osx_newbuildsys/src/osx
by js＠gajim.org 04 Oct '08

04 Oct '08

Author: js Date: 2008-10-05 01:51:19 +0200 (Sun, 05 Oct 2008) New Revision: 10476 Modified: branches/osx_newbuildsys/src/osx/Makefile Log: Oops. Forgot that. Modified: branches/osx_newbuildsys/src/osx/Makefile =================================================================== --- branches/osx_newbuildsys/src/osx/Makefile 2008-10-04 11:06:53 UTC (rev 10475) +++ branches/osx_newbuildsys/src/osx/Makefile 2008-10-04 23:51:19 UTC (rev 10476) @@ -3,7 +3,6 @@ SUBDIRS = ${OSX_IDLEMODULE} ${OSX_MODULES} SRCS = __init__.py \ - dbus.py \ growler.py \ prep_py2app.py DISTCLEAN = idle.so nsapp.so

1 0

[commit-gajim] r10475 - in branches/osx_newbuildsys: . src
by js＠gajim.org 04 Oct '08

04 Oct '08

Author: js Date: 2008-10-04 13:06:53 +0200 (Sat, 04 Oct 2008) New Revision: 10475 Modified: branches/osx_newbuildsys/configure.ac branches/osx_newbuildsys/src/dock.py branches/osx_newbuildsys/src/notify.py Log: Move bounce code. Modified: branches/osx_newbuildsys/configure.ac =================================================================== --- branches/osx_newbuildsys/configure.ac 2008-10-04 10:20:14 UTC (rev 10474) +++ branches/osx_newbuildsys/configure.ac 2008-10-04 11:06:53 UTC (rev 10475) @@ -12,6 +12,7 @@ AC_ISC_POSIX AC_PROG_CC AC_PROG_OBJC +AC_PROG_LN_S AC_C_CONST AC_CHECK_HEADERS([libintl.h]) Modified: branches/osx_newbuildsys/src/dock.py =================================================================== --- branches/osx_newbuildsys/src/dock.py 2008-10-04 10:20:14 UTC (rev 10474) +++ branches/osx_newbuildsys/src/dock.py 2008-10-04 11:06:53 UTC (rev 10475) @@ -20,6 +20,7 @@ from common import gajim from common import helpers +import osx HAS_SYSTRAY_CAPABILITIES = True DOCK_IMAGES = {} @@ -73,5 +74,11 @@ if global_status is not None and self.status != global_status: self.status = global_status self.set_img() + + def bounce(self): + try: + osx.nsapp.requestUserAttention() + except NameError: + pass # vim: se ts=3: Modified: branches/osx_newbuildsys/src/notify.py =================================================================== --- branches/osx_newbuildsys/src/notify.py 2008-10-04 10:20:14 UTC (rev 10474) +++ branches/osx_newbuildsys/src/notify.py 2008-10-04 11:06:53 UTC (rev 10475) @@ -58,11 +58,6 @@ except: USER_HAS_GROWL = False -try: - from AppKit import * -except ImportError: - pass - def get_show_in_roster(event, account, contact, session=None): '''Return True if this event must be shown in roster, else False''' if event == 'gc_message_received': @@ -319,10 +314,7 @@ if do_bounce: if sys.platform == 'darwin': - try: - NSApp.requestUserAttention_(NSInformationalRequest) - except NameError: - pass + gajim.interface.dock.bounce() if do_cmd: command = gajim.config.get_per('notifications', str(advanced_notif_num),

1 0

[commit-gajim] r10474 - in trunk/src: . common
by asterix＠gajim.org 04 Oct '08

04 Oct '08

Author: asterix Date: 2008-10-04 12:20:14 +0200 (Sat, 04 Oct 2008) New Revision: 10474 Modified: trunk/src/chat_control.py trunk/src/common/config.py Log: auto-create per_option config when trying to write in a non-existing one. Fixes #4370 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-10-03 13:56:36 UTC (rev 10473) +++ trunk/src/chat_control.py 2008-10-04 10:20:14 UTC (rev 10474) @@ -1554,10 +1554,6 @@ ChatControlBase.print_conversation_line(self, msg, 'status', '', None) - gpg_pref = gajim.config.get_per('contacts', self.contact.jid, - 'gpg_enabled') - if gpg_pref is None: - gajim.config.add_per('contacts', self.contact.jid) gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', self.gpg_is_active) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-10-03 13:56:36 UTC (rev 10473) +++ trunk/src/common/config.py 2008-10-04 10:20:14 UTC (rev 10474) @@ -578,7 +578,7 @@ dict = self.__options_per_key[optname][1] if not dict.has_key(key): # raise RuntimeError, '%s is not a key of %s' % (key, dict) - return + self.add_per(optname, key) obj = dict[key] if not obj.has_key(subname): # raise RuntimeError, '%s is not a key of %s' % (subname, obj)

1 0

[commit-gajim] r10473 - trunk/src
by js＠gajim.org 03 Oct '08

03 Oct '08

Author: js Date: 2008-10-03 15:56:36 +0200 (Fri, 03 Oct 2008) New Revision: 10473 Modified: trunk/src/gajim.py Log: Apply my suggested patch from #4368. Fixes #4368. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-10-03 10:17:30 UTC (rev 10472) +++ trunk/src/gajim.py 2008-10-03 13:56:36 UTC (rev 10473) @@ -435,11 +435,19 @@ ''' this method is called when we plug a new idle object. Start listening for events from fd ''' - res = gobject.io_add_watch(fd, flags, self.process_events, + res = gobject.io_add_watch(fd, flags, self._process_events, priority=gobject.PRIORITY_LOW) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res + def _process_events(self, fd, flags): + try: + return self.process_events(fd, flags) + except: + self.remove_idle(fd) + self.add_idle(fd, flags) + raise + def remove_idle(self, fd): ''' this method is called when we unplug a new idle object. Stop listening for events from fd

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2008