Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: Forgot to remove some OS X stuff.
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset a596966c014a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a596966c014a description: Forgot to remove some OS X stuff. diffstat: data/nibs/Gajim.nib/classes.nib | 4 - data/nibs/Gajim.nib/info.nib | 24 ---- data/nibs/Gajim.nib/keyedobjects.nib | setup_osx.py | 223 ------------------------------------- 4 files changed, 0 insertions(+), 251 deletions(-) diffs (266 lines): diff -r 87f02e65a1e7 -r a596966c014a data/nibs/Gajim.nib/classes.nib --- a/data/nibs/Gajim.nib/classes.nib Mon Jun 15 21:34:43 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -{ - IBClasses = ({CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }); - IBVersion = 1; -} \ No newline at end of file diff -r 87f02e65a1e7 -r a596966c014a data/nibs/Gajim.nib/info.nib --- a/data/nibs/Gajim.nib/info.nib Mon Jun 15 21:34:43 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>82 255 356 240 0 0 1280 832 </string> - <key>IBEditorPositions</key> - <dict> - <key>29</key> - <string>476 296 342 44 0 0 1280 832 </string> - </dict> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBOldestOS</key> - <integer>4</integer> - <key>IBOpenObjects</key> - <array> - <integer>289</integer> - <integer>29</integer> - </array> - <key>IBSystem Version</key> - <string>8S165</string> -</dict> -</plist> diff -r 87f02e65a1e7 -r a596966c014a data/nibs/Gajim.nib/keyedobjects.nib Binary file data/nibs/Gajim.nib/keyedobjects.nib has changed diff -r 87f02e65a1e7 -r a596966c014a setup_osx.py --- a/setup_osx.py Mon Jun 15 21:34:43 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,223 +0,0 @@ -## setup_osx.py -## -## Copyright (C) 2007 James Newton <redshodan AT gmail.com> -## Copyright (C) 2007-2008 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -""" -Usage: - python setup_osx.py [build | dist] -""" - -from setuptools import setup -import sys, glob, os, commands, types -from os import system, unlink, symlink, getcwd, mkdir, utime -from shutil import move, copy, copytree, rmtree - -### -### Globals -### - -GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current" -NAME = 'Gajim' -VERSION = '0.12.1' -DESCRIPTION = 'A full featured Jabber client' -AUTHOR = 'Gajim Development Team' -URL = 'http://www.gajim.org/' -DOWNLOAD_URL = 'http://www.gajim.org/downloads.php' -LICENSE = 'GPL' -PWD = getcwd() -APP_RS = "dist/Gajim.app/Contents/Resources" - -GAJIM_SCRIPT = \ -'#!/bin/bash \n\ -export DYLD_LIBRARY_PATH=%s/lib \n\ -export PATH=%s/bin:$PATH \n\ -export PYTHONPATH=%s/lib/python2.5/site-packages:%s/lib/python2.5/site-packages/gtk-2.0 \n\ -exec ${0}.bin \n\ -' % (GTK_DIR, GTK_DIR, GTK_DIR, GTK_DIR) - -GAJIM_REMOTE_SCRIPT = \ -'#!/bin/bash \n\ -export DYLD_LIBRARY_PATH=%s/lib \n\ -TOPDIR=${0%%/MacOS/gajim-remote} \n\ -echo "${TOPDIR}" | grep -e "^/" \n\ -[ $? -ne 0 ] && TOPDIR=`pwd`/${TOPDIR} \n\ -export RESOURCEPATH=${TOPDIR}/Resources \n\ -export PYTHONHOME=${RESOURCEPATH}/lib/python2.5 \n\ -export PYTHONPATH=${RESOURCEPATH}/lib/python2.5/lib-dynload:${RESOURCEPATH}/lib/python2.5/site-packages.zip:${PYTHONPATH} \n\ -cd ${RESOURCEPATH} \n\ -exec ${TOPDIR}/MacOS/Python ${RESOURCEPATH}/gajim-remote.py $* \n\ -' % GTK_DIR - -### -### Functions -### - -def check(ret): - if isinstance(ret, list): - if ret[0] != 0: - raise Exception("Command failed: " + ret[1]) - elif isinstance(ret, int): - if ret != 0: - raise Exception("Command failed") - return - - -def force(func): - try: - func() - except Exception: - pass - return - - -def writeScript(filename, contents): - script = open(filename, "w+") - script.write(contents) - script.close() - system("chmod +x %s" % filename) - return - - -def cleanup(): - force(lambda:rmtree("build")) - force(lambda:rmtree("dist")) - -def stageInstall(): - check(system("make DATADIR=%s/build/inst LIBDIR=%s/build/inst prefix=%s/build/inst DOCDIR=%s/build/inst/share/doc install" % (PWD, PWD, PWD, PWD))) - force(lambda:unlink("src/osx/growl/_growl.so")) - force(lambda:unlink("src/osx/growl/_growlImage.so")) - force(lambda:unlink("src/osx/idle.so")) - force(lambda:unlink("src/osx/nsapp.so")) - force(lambda:unlink("src/osx/syncmenu.so")) - force(lambda:unlink("src/gtkspell.so")) - symlink("%s/build/inst/lib/gajim/_growl.so" % PWD, "src/osx/growl/_growl.so") - symlink("%s/build/inst/lib/gajim/_growlImage.so" % PWD, - "src/osx/growl/_growlImage.so") - symlink("%s/build/inst/lib/gajim/idle.so" % PWD, "src/osx/idle.so") - symlink("%s/build/inst/lib/gajim/nsapp.so" % PWD, "src/osx/nsapp.so") - symlink("%s/build/inst/lib/gajim/syncmenu.so" % PWD, "src/osx/syncmenu.so") - if os.path.isfile("build/inst/lib/gajim/gtkspell.so"): - symlink("%s/build/inst/lib/gajim/gtkspell.so" % PWD, "src/gtkspell.so") - return - - -def buildApp(): - sys.path.append('src') - sys.path.append(GTK_DIR + "/lib/python2.5/site-packages") - sys.path.append(GTK_DIR + "/lib/python2.5/site-packages/gtk-2.0") - OPTIONS = {'argv_emulation':True, - 'excludes':'docutils,Crypto,dbus,OpenSSL,cairo,gtk,gobject,atk,pangocairo', - 'iconfile':'data/pixmaps/gajim.icns', - 'includes':'osx,ConfigParser,compiler,UserString,history_manager', - 'plist':{'LSMinimumSystemVersion':'10.4.0', - 'NSHumanReadableCopyright':'GNU General Public License', - 'CFBundleIdentifier':'org.gajim', - 'NSMainNibFile':'Gajim', - }, - } - setup( - name = NAME, version = VERSION, description = DESCRIPTION, - author = AUTHOR, url = URL, download_url = DOWNLOAD_URL, - license = LICENSE, - app=['src/gajim.py'], - data_files=['data/nibs/Gajim.nib'], - options={'py2app': OPTIONS}, - setup_requires=['py2app'], - ) - return - - -def setupPrep(): - copy("src/osx/prep_py2app.py", APP_RS) - move("dist/Gajim.app/Contents/Resources/__boot__.py", - "dist/Gajim.app/Contents/Resources/__boot__.py.org") - new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+") - org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org") - for line in org: - new.write(line) - if (('site.addsitedir' in line) and ('Python' in line)): - new.write(" import prep_py2app\n") - new.close() - org.close() - unlink("dist/Gajim.app/Contents/Resources/__boot__.py.org") - return - - -def finishApp(): - # setup gajim dirs - copytree("build/inst/share/gajim/data", APP_RS + "/data") - copy("data/pixmaps/gajim.icns", APP_RS + "/data/pixmaps") - copytree("build/inst/share/locale", APP_RS + "/locale") - copytree("build/inst/share/man", APP_RS + "/man") - force(lambda:unlink("dist/Gajim.app/Contents/data")) - symlink("Resources/data", "dist/Gajim.app/Contents/data") - copy("src/gajim-remote.py", "dist/Gajim.app/Contents/Resources") - # Nuke libs that are in the framework - move("dist/Gajim.app/Contents/Frameworks/Python.framework", - "dist/Gajim.app/Contents/Python.framework") - rmtree("dist/Gajim.app/Contents/Frameworks") - mkdir("dist/Gajim.app/Contents/Frameworks") - move("dist/Gajim.app/Contents/Python.framework", - "dist/Gajim.app/Contents/Frameworks/Python.framework") - # Adjust the running of the app - move("dist/Gajim.app/Contents/MacOS/Gajim", - "dist/Gajim.app/Contents/MacOS/Gajim.bin") - writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT) - setupPrep() - # Setup the gajim-remote script - writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote", - GAJIM_REMOTE_SCRIPT) - # Touch the top dir so Finder knows to update its idea of this bundle - utime("dist/Gajim.app", None) - return - - -def distApp(): - force(lambda:rmtree("dist/Gajim")) - force(lambda:rmtree("dist/Gajim.tar.bz2")) - mkdir("dist/Gajim") - check(system("tar -cf - -C dist Gajim.app | tar -xf - -C dist/Gajim")) - copy("README.osx", "dist/Gajim/README") - copy("TODO.osx", "dist/Gajim/TODO") - check(system("tar -C dist -jcf dist/Gajim-OSX-`date | awk '{printf(\"%s-%s-%s\", $6, $2, $3);}'`.tar.bz2 Gajim")) - rmtree("dist/Gajim") - return - - - -### -### Start -### -if ((len(sys.argv) != 2) or ((sys.argv[1] != "build") and - (sys.argv[1] != "dist"))): - print "usage: python setup_osx.py [build]" - print " or: python setup_osx.py [dist]" - sys.exit(1) -elif sys.argv[1] == "build": - sys.argv[1] = "py2app" - sys.argv.append('--use-pythonpath') - cleanup() - stageInstall() - buildApp() - finishApp() -elif sys.argv[1] == "dist": - distApp() - -# vim: se ts=3:

1 0

gajim: Merge default branch to osx_newbuildsys after OS X code r...
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset beee680e4659 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=beee680e4659 description: Merge default branch to osx_newbuildsys after OS X code removal. diffstat: .hgignore | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diffs (31 lines): diff -r 13456265e035 -r beee680e4659 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jun 15 21:47:18 2009 +0200 @@ -0,0 +1,27 @@ +syntax: glob +*.gmo +*.in +*.la +*.lo +*.m4 +*.pyc +*.pyo +*.o +*.Plo +*~ +autom4te.cache +data/defs.py +data/gajim.desktop +libtool +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +stamp-h1 +Makefile + +syntax: regexp +^config\.* +^config\/ +^src\/\.libs +^src\/trayicon.c +^scripts\/gajim.*

1 0

gajim: Remove all OS X-specific code from the default branch.
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset 0a081d1523c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a081d1523c7 description: Remove all OS X-specific code from the default branch. OS X support is still maintained in the osx_newbuildsys branch - and only there. X-Hg-Repo: gajim Subject: gajim: Automated merge with ssh://hg@gajim.org/gajim From: Jonathan Schleifer <js(a)webkeks.org> changeset 87f02e65a1e7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=87f02e65a1e7 description: Automated merge with ssh://hg@gajim.org/gajim diffstat: .hgignore | 27 + autogen.sh | 2 +- configure.ac | 71 ---- src/Makefile.am | 2 - src/common/config.py | 14 +- src/common/dbus_support.py | 6 - src/common/helpers.py | 22 +- src/common/sleepy.py | 3 - src/config.py | 46 +-- src/features_window.py | 6 - src/gajim-remote.py | 3 - src/gajim.py | 28 +- src/gtkgui_helpers.py | 5 - src/network_manager_listener.py | 4 +- src/notify.py | 14 - src/osx/Makefile.am | 45 -- src/osx/__init__.py | 45 -- src/osx/dbus.py | 133 -------- src/osx/growl/Growl.py | 245 --------------- src/osx/growl/Makefile.am | 41 -- src/osx/growl/__init__.py | 3 - src/osx/growl/_growl.c | 239 -------------- src/osx/growl/_growlImage.m | 274 ----------------- src/osx/growl/setup.py | 27 - src/osx/growler.py | 64 ---- src/osx/idle.c | 175 ---------- src/osx/nsapp.h | 19 - src/osx/nsapp.m | 239 -------------- src/osx/prep_py2app.py | 25 - src/osx/setup.py | 22 - src/osx/syncmenu/Makefile.am | 21 - src/osx/syncmenu/pysyncmenu.c | 55 --- src/osx/syncmenu/setup.py | 30 - src/osx/syncmenu/sync-menu.c | 728 --------------------------------------------- src/osx/syncmenu/sync-menu.h | 27 - src/osx/syncmenu/test-menu.c | 107 ------ src/osx/syncmenu/test-menu.py | 79 ---- src/roster_window.py | 75 ---- src/statusicon.py | 11 - 39 files changed, 46 insertions(+), 2936 deletions(-) diffs (truncated from 3384 to 300 lines): diff -r d079ffe7bb5a -r 87f02e65a1e7 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jun 15 21:34:43 2009 +0200 @@ -0,0 +1,27 @@ +syntax: glob +*.gmo +*.in +*.la +*.lo +*.m4 +*.pyc +*.pyo +*.o +*.Plo +*~ +autom4te.cache +data/defs.py +data/gajim.desktop +libtool +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +stamp-h1 +Makefile + +syntax: regexp +^config\.* +^config\/ +^src\/\.libs +^src\/trayicon.c +^scripts\/gajim.* diff -r d079ffe7bb5a -r 87f02e65a1e7 autogen.sh --- a/autogen.sh Mon Jun 15 21:00:14 2009 +0200 +++ b/autogen.sh Mon Jun 15 21:34:43 2009 +0200 @@ -9,7 +9,7 @@ echo "[encoding: UTF-8]" > po/POTFILES.in \ && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ - src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \ + src/*py src/common/*py src/common/zeroconf/*.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" diff -r d079ffe7bb5a -r 87f02e65a1e7 configure.ac --- a/configure.ac Mon Jun 15 21:00:14 2009 +0200 +++ b/configure.ac Mon Jun 15 21:34:43 2009 +0200 @@ -59,72 +59,6 @@ test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon) -dnl **** -dnl Cocoa -dnl **** -AC_ARG_ENABLE([cocoa], - [ --disable-cocoa do not build cocoa integration [default auto]], - enable_cocoa=$enableval, enable_cocoa=yes) - -if test "x$enable_cocoa" = "xyes";then - dnl There is no pkgconfig for cocoa; lets do a header check - temp_save_cflags="$CFLAGS" - CFLAGS="$CFLAGS -ObjC" - AC_CHECK_HEADER(Cocoa/Cocoa.h, [have_cocoa=true], [have_cocoa=false]) - AC_CHECK_HEADER(AppKit/AppKit.h, [have_appkit=true], [have_appkit=false]) - CFLAGS="$temp_save_cflags" - - if test "x$have_cocoa" = "xtrue";then - COCOA_LIBS="$COCOA_LIBS -Xlinker -framework -Xlinker Cocoa" - fi - if test "x$have_appkit" = "xtrue";then - COCOA_LIBS="$COCOA_LIBS -Xlinker -framework -Xlinker AppKit" - fi - if test "x$COCOA_LIBS" != "x";then - AC_SUBST(COCOA_LIBS) - true - fi -fi -AM_CONDITIONAL(BUILD_COCOA, $have_cocoa) - -dnl **** -dnl Carbon -dnl **** -AC_ARG_ENABLE([carbon], - [ --disable-carbon do not build with carbon [default auto]], - enable_carbon=$enableval, enable_carbon=yes) - -if test "x$enable_carbon" = "xyes";then - dnl There is no pkgconfig for carbon; lets do a header check - AC_CHECK_HEADER(Carbon/Carbon.h, [have_carbon=true], [have_carbon=false]) - AC_CHECK_HEADER(IOKit/IOKitLib.h, [have_iokit=true], [have_iokit=false]) - - if test "x$have_carbon" = "xtrue";then - CARBON_LIBS="$CARBON_LIBS -Xlinker -framework -Xlinker Carbon" - fi - if test "x$have_iokit" = "xtrue";then - CARBON_LIBS="$CARBON_LIBS -Xlinker -framework -Xlinker IOKit" - fi - if test "x$CARBON_LIBS" != "x";then - AC_SUBST(CARBON_LIBS) - have_idle_osx=true - dnl Disable custom trayicon - have_trayicon=gtk+ - AM_CONDITIONAL(BUILD_TRAYICON, false) - dnl Hack to work around failure in gettext package detection on OS/X - if test "x$GMSGFMT" = "x";then - AC_SUBST(GMSGFMT, msgfmt) - AC_SUBST(MSGFMT, msgfmt) - AC_SUBST(XGETTEXT, xgettext) - fi - else - have_carbon=false - have_idle_osx=false - fi -fi -AM_CONDITIONAL(BUILD_IDLE_OSX, $have_carbon) -AM_CONDITIONAL(BUILD_CARBON, $have_carbon) - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) @@ -151,9 +85,6 @@ data/gajim.desktop.in data/defs.py src/Makefile - src/osx/Makefile - src/osx/growl/Makefile - src/osx/syncmenu/Makefile scripts/gajim scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in @@ -164,6 +95,4 @@ ***************************** Build features: trayicon ......... ${have_trayicon} - idle module OSX .. ${have_idle_osx} - cocoa (OSX)....... ${have_cocoa} *****************************" diff -r d079ffe7bb5a -r 87f02e65a1e7 src/Makefile.am --- a/src/Makefile.am Mon Jun 15 21:00:14 2009 +0200 +++ b/src/Makefile.am Mon Jun 15 21:34:43 2009 +0200 @@ -1,5 +1,3 @@ -SUBDIRS = osx - CLEANFILES = \ trayicon.c INCLUDES = \ diff -r d079ffe7bb5a -r 87f02e65a1e7 src/common/config.py --- a/src/common/config.py Mon Jun 15 21:00:14 2009 +0200 +++ b/src/common/config.py Mon Jun 15 21:34:43 2009 +0200 @@ -59,16 +59,10 @@ DEFAULT_ICONSET = 'dcraven' DEFAULT_MOOD_ICONSET = 'default' DEFAULT_ACTIVITY_ICONSET = 'default' - if sys.platform == 'darwin': - DEFAULT_OPENWITH = 'open' - DEFAULT_BROWSER = 'open -a Safari' - DEFAULT_MAILAPP = 'open -a Mail' - DEFAULT_FILE_MANAGER = 'open -a Finder' - else: - DEFAULT_OPENWITH = 'gnome-open' - DEFAULT_BROWSER = 'firefox' - DEFAULT_MAILAPP = 'mozilla-thunderbird -compose' - DEFAULT_FILE_MANAGER = 'xffm' + DEFAULT_OPENWITH = 'gnome-open' + DEFAULT_BROWSER = 'firefox' + DEFAULT_MAILAPP = 'mozilla-thunderbird -compose' + DEFAULT_FILE_MANAGER = 'xffm' __options = { # name: [ type, default_value, help_string ] diff -r d079ffe7bb5a -r 87f02e65a1e7 src/common/dbus_support.py --- a/src/common/dbus_support.py Mon Jun 15 21:00:14 2009 +0200 +++ b/src/common/dbus_support.py Mon Jun 15 21:34:43 2009 +0200 @@ -32,12 +32,6 @@ _GAJIM_ERROR_IFACE = 'org.gajim.dbus.Error' try: - if sys.platform == 'darwin': - try: - import osx.dbus - osx.dbus.load(True) - except ImportError: - pass import dbus import dbus.glib # test if dbus-x11 is installed diff -r d079ffe7bb5a -r 87f02e65a1e7 src/common/helpers.py --- a/src/common/helpers.py Mon Jun 15 21:00:14 2009 +0200 +++ b/src/common/helpers.py Mon Jun 15 21:34:43 2009 +0200 @@ -367,11 +367,7 @@ if re.match('^file:///[a-zA-Z]:/', path): # windows path = path[8:] # 8 is len('file:///') elif path.startswith('file://'): # nautilus, rox - if sys.platform == 'darwin': - # OS/X includes hostname in file:// URI - path = re.sub('file://[^/]*', '', path) - else: - path = path[7:] # 7 is len('file://') + path = path[7:] # 7 is len('file://') elif path.startswith('file:'): # xffm path = path[5:] # 5 is len('file:') return path @@ -638,11 +634,6 @@ import gajim import pep -try: - from osx import nsapp -except ImportError: - pass - def convert_bytes(string): suffix = '' @@ -723,9 +714,6 @@ command = 'kfmclient exec' elif gajim.config.get('openwith') == 'exo-open': command = 'exo-open' - elif ((sys.platform == 'darwin') and\ - (gajim.config.get('openwith') == 'open')): - command = 'open' elif gajim.config.get('openwith') == 'custom': if kind == 'url': command = gajim.config.get('custombrowser') @@ -753,9 +741,6 @@ command = 'kfmclient exec' elif gajim.config.get('openwith') == 'exo-open': command = 'exo-open' - elif ((sys.platform == 'darwin') and\ - (gajim.config.get('openwith') == 'open')): - command = 'open' elif gajim.config.get('openwith') == 'custom': command = gajim.config.get('custom_file_manager') if command == '': # if no app is configured @@ -819,11 +804,6 @@ path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return - if sys.platform == 'darwin': - try: - nsapp.playFile(path_to_soundfile) - except NameError: - pass elif os.name == 'nt': try: winsound.PlaySound(path_to_soundfile, diff -r d079ffe7bb5a -r 87f02e65a1e7 src/common/sleepy.py --- a/src/common/sleepy.py Mon Jun 15 21:00:14 2009 +0200 +++ b/src/common/sleepy.py Mon Jun 15 21:34:43 2009 +0200 @@ -43,9 +43,6 @@ lastInputInfo = LASTINPUTINFO() lastInputInfo.cbSize = ctypes.sizeof(lastInputInfo) - - elif sys.platform == 'darwin': - import osx.idle as idle else: # unix from common import idle except Exception: diff -r d079ffe7bb5a -r 87f02e65a1e7 src/config.py --- a/src/config.py Mon Jun 15 21:00:14 2009 +0200 +++ b/src/config.py Mon Jun 15 21:34:43 2009 +0200 @@ -437,15 +437,6 @@ self.xml.get_widget('custom_apps_frame').hide() self.xml.get_widget('custom_apps_frame').set_no_show_all(True) - if sys.platform == 'darwin': - self.applications_combobox.remove_text(4) - self.applications_combobox.remove_text(3) - self.applications_combobox.remove_text(2) - self.applications_combobox.remove_text(1) - self.applications_combobox.append_text( - _('Always use OS/X default applications')) - self.applications_combobox.append_text(_('Custom')) - if gajim.config.get('autodetect_browser_mailer'): self.applications_combobox.set_active(0) # else autodetect_browser_mailer is False. @@ -456,14 +447,8 @@ self.applications_combobox.set_active(2) elif gajim.config.get('openwith') == 'exo-open': self.applications_combobox.set_active(3) - elif ((sys.platform == 'darwin') and\ - (gajim.config.get('openwith') == 'open')): - self.applications_combobox.set_active(1) elif gajim.config.get('openwith') == 'custom': - if sys.platform == 'darwin': - self.applications_combobox.set_active(2) - else: - self.applications_combobox.set_active(4) + self.applications_combobox.set_active(4) self.xml.get_widget('custom_apps_frame').show() self.xml.get_widget('custom_browser_entry').set_text( @@ -962,30 +947,19 @@ def on_applications_combobox_changed(self, widget): gajim.config.set('autodetect_browser_mailer', False) - if sys.platform == 'darwin': + if widget.get_active() == 4: + self.xml.get_widget('custom_apps_frame').show()

1 0

gajim: [johnny] Added .hgignore file.
by vardo＠lagaule.org 15 Jun '09

15 Jun '09

changeset 91762ca2b2ff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=91762ca2b2ff description: [johnny] Added .hgignore file. diffstat: .hgignore | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diffs (31 lines): diff -r d079ffe7bb5a -r 91762ca2b2ff .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jun 15 21:22:22 2009 +0200 @@ -0,0 +1,27 @@ +syntax: glob +*.gmo +*.in +*.la +*.lo +*.m4 +*.pyc +*.pyo +*.o +*.Plo +*~ +autom4te.cache +data/defs.py +data/gajim.desktop +libtool +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +stamp-h1 +Makefile + +syntax: regexp +^config\.* +^config\/ +^src\/\.libs +^src\/trayicon.c +^scripts\/gajim.*

1 0

gajim: Merge default branch into osx_newbuildsys.
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset dd0aeef8ad08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dd0aeef8ad08 description: Merge default branch into osx_newbuildsys. X-Hg-Repo: gajim Subject: gajim: Remove spaces at EOL. From: Jonathan Schleifer <js(a)webkeks.org> changeset d079ffe7bb5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d079ffe7bb5a description: Remove spaces at EOL. X-Hg-Repo: gajim Subject: gajim: Remove whitespaces at EOL. From: Jonathan Schleifer <js(a)webkeks.org> changeset 13456265e035 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=13456265e035 description: Remove whitespaces at EOL. diffstat: po/POTFILES.skip | 1 + src/advanced.py | 16 ++-- src/common/connection.py | 10 +- src/common/dataforms.py | 80 +++++++++++++------------- src/common/helpers.py | 2 +- src/common/optparser.py | 2 +- src/common/resolver.py | 36 ++++++------ src/common/xmpp/auth_nb.py | 12 ++-- src/common/xmpp/bosh.py | 42 +++++++------- src/common/xmpp/client_nb.py | 32 +++++----- src/common/xmpp/dispatcher_nb.py | 36 ++++++------ src/common/xmpp/features_nb.py | 10 +- src/common/xmpp/idlequeue.py | 76 ++++++++++++------------ src/common/xmpp/plugin.py | 12 ++-- src/common/xmpp/proxy_connectors.py | 20 +++--- src/common/xmpp/roster_nb.py | 6 +- src/common/xmpp/simplexml.py | 2 +- src/common/xmpp/tls_nb.py | 14 ++-- src/common/xmpp/transports_nb.py | 46 +++++++------- src/config.py | 18 +++--- src/dialogs.py | 4 +- src/dock.py | 6 +- src/gajim.py | 4 +- src/gtkgui_helpers.py | 10 ++- src/ipython_view.py | 2 +- src/message_textview.py | 2 +- src/network_manager_listener.py | 44 ++++++++------ src/notify.py | 2 +- src/osx/growl/growlImage_m/_growlImage.m | 58 +++++++++--------- src/osx/nsapp_m/nsapp.h | 2 +- src/osx/nsapp_m/nsapp.m | 12 ++-- src/osx/syncmenu/syncmenu_c/syncmenu.c | 54 +++++++++--------- src/osx/syncmenu/test-menu.c | 10 +- src/systray.py | 4 +- src/traymodule/eggtrayicon.c | 4 +- src/traymodule/trayiconmodule.c | 4 +- 36 files changed, 354 insertions(+), 341 deletions(-) diffs (truncated from 2320 to 300 lines): diff -r 14b5b54a7dbf -r 13456265e035 po/POTFILES.skip --- a/po/POTFILES.skip Mon Jun 08 17:29:28 2009 +0200 +++ b/po/POTFILES.skip Mon Jun 15 21:07:39 2009 +0200 @@ -1,2 +1,3 @@ data/gajim.desktop.in src/eggtrayicon.c +src/ipython_view.py diff -r 14b5b54a7dbf -r 13456265e035 src/advanced.py --- a/src/advanced.py Mon Jun 08 17:29:28 2009 +0200 +++ b/src/advanced.py Mon Jun 15 21:07:39 2009 +0200 @@ -268,14 +268,14 @@ def visible_func(self, model, treeiter): search_string = self.entry.get_text().lower() - for it in tree_model_pre_order(model,treeiter): - if model[it][C_TYPE] != '': - opt_path = self.get_option_path(model, it) - if len(opt_path) == 3: - desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], - opt_path[0]) - elif len(opt_path) == 1: - desc = gajim.config.get_desc(opt_path[0]) + for it in tree_model_pre_order(model,treeiter): + if model[it][C_TYPE] != '': + opt_path = self.get_option_path(model, it) + if len(opt_path) == 3: + desc = gajim.config.get_desc_per(opt_path[2], opt_path[1], + opt_path[0]) + elif len(opt_path) == 1: + desc = gajim.config.get_desc(opt_path[0]) if search_string in model[it][C_PREFNAME] or (desc and \ search_string in desc.lower()): return True diff -r 14b5b54a7dbf -r 13456265e035 src/common/connection.py --- a/src/common/connection.py Mon Jun 08 17:29:28 2009 +0200 +++ b/src/common/connection.py Mon Jun 15 21:07:39 2009 +0200 @@ -727,11 +727,11 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1) self._register_handlers(con, con_type) - con.auth( - user=name, - password=self.password, - resource=self.server_resource, - sasl=1, + con.auth( + user=name, + password=self.password, + resource=self.server_resource, + sasl=1, on_auth=self.__on_auth) def ssl_certificate_accepted(self): diff -r 14b5b54a7dbf -r 13456265e035 src/common/dataforms.py --- a/src/common/dataforms.py Mon Jun 08 17:29:28 2009 +0200 +++ b/src/common/dataforms.py Mon Jun 15 21:07:39 2009 +0200 @@ -104,7 +104,7 @@ """ Keeps data about one field - var, field type, labels, instructions... Base class for different kinds of fields. Use Field() function to construct one of these. """ - + def __init__(self, typ=None, var=None, value=None, label=None, desc=None, required=False, options=None, extend=None): @@ -137,7 +137,7 @@ def fset(self, value): assert isinstance(value, basestring) self.setAttr('type', value) - + return locals() @nested_property @@ -152,7 +152,7 @@ def fdel(self): self.delAttr('var') - + return locals() @nested_property @@ -163,15 +163,15 @@ if not l: l = self.var return l - + def fset(self, value): assert isinstance(value, basestring) self.setAttr('label', value) - + def fdel(self): if self.getAttr('label'): self.delAttr('label') - + return locals() @nested_property @@ -179,19 +179,19 @@ '''Human-readable description of field meaning.''' def fget(self): return self.getTagData('desc') or u'' - + def fset(self, value): assert isinstance(value, basestring) if value == '': fdel(self) else: self.setTagData('desc', value) - + def fdel(self): t = self.getTag('desc') if t is not None: self.delChild(t) - + return locals() @nested_property @@ -199,14 +199,14 @@ '''Controls whether this field required to fill. Boolean.''' def fget(self): return bool(self.getTag('required')) - + def fset(self, value): t = self.getTag('required') if t and not value: self.delChild(t) elif not t and value: self.addChild('required') - + return locals() class BooleanField(DataField): @@ -222,15 +222,15 @@ if v is None: return False # default value is False raise WrongFieldValue - + def fset(self, value): self.setTagData('value', value and '1' or '0') - + def fdel(self, value): t = self.getTag('value') if t is not None: self.delChild(t) - + return locals() class StringField(DataField): @@ -240,19 +240,19 @@ '''Value of field. May be any unicode string.''' def fget(self): return self.getTagData('value') or u'' - + def fset(self, value): assert isinstance(value, basestring) if value == '': return fdel(self) self.setTagData('value', value) - + def fdel(self): try: self.delChild(self.getTag('value')) except ValueError: # if there already were no value tag pass - + return locals() class ListField(DataField): @@ -271,16 +271,16 @@ l = v options.append((l, v)) return options - + def fset(self, values): fdel(self) for value, label in values: self.addChild('option', {'label': label}).setTagData('value', value) - + def fdel(self): for element in self.getTags('option'): self.delChild(element) - + return locals() def iter_options(self): @@ -307,16 +307,16 @@ for element in self.getTags('value'): values.append(element.getData()) return values - + def fset(self, values): fdel(self) for value in values: self.addChild('value').setData(value) - + def fdel(self): for element in self.getTags('value'): self.delChild(element) - + return locals() def iter_values(self): @@ -332,18 +332,18 @@ for element in self.iterTags('value'): value += '\n' + element.getData() return value[1:] - + def fset(self, value): fdel(self) if value == '': return for line in value.split('\n'): self.addChild('value').setData(line) - + def fdel(self): for element in self.getTags('value'): self.delChild(element) - + return locals() class DataRecord(ExtendedNode): @@ -376,18 +376,18 @@ '''List of fields in this record.''' def fget(self): return self.getTags('field') - + def fset(self, fields): fdel(self) for field in fields: if not isinstance(field, DataField): ExtendField(extend=field) self.addChild(node=field) - + def fdel(self): for element in self.getTags('field'): self.delChild(element) - + return locals() def iter_fields(self): @@ -425,11 +425,11 @@ filledform = DataForm(replyto=thisform)...''' def fget(self): return self.getAttr('type') - + def fset(self, type_): assert type_ in ('form', 'submit', 'cancel', 'result') self.setAttr('type', type_) - + return locals() @nested_property @@ -437,16 +437,16 @@ ''' Title of the form. Human-readable, should not contain any \\r\\n.''' def fget(self): return self.getTagData('title') - + def fset(self, title): self.setTagData('title', title) - + def fdel(self): try: self.delChild('title') except ValueError: pass - + return locals()

1 0

gajim: import xmpp only when needed in helpers.py so decode_stri...
by Yann Leboulanger 15 Jun '09

15 Jun '09

changeset 1a8f567647a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1a8f567647a9 description: import xmpp only when needed in helpers.py so decode_string is loaded before. see #4764 diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r d90ab5f5e182 -r 1a8f567647a9 src/common/helpers.py --- a/src/common/helpers.py Sat Jun 13 20:31:40 2009 +0200 +++ b/src/common/helpers.py Mon Jun 15 09:12:32 2009 +0200 @@ -44,7 +44,6 @@ from i18n import Q_ from i18n import ngettext -import xmpp try: import winsound # windows-only built-in module for playing wav @@ -1347,6 +1346,7 @@ return keyID def update_optional_features(account = None): + import xmpp if account: accounts = [account] else:

1 0

gajim: import xmpp only when needed in helpers.py so decode_stri...
by Yann Leboulanger 15 Jun '09

15 Jun '09

changeset ea5574252909 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ea5574252909 description: import xmpp only when needed in helpers.py so decode_string is loaded before. see #4764 diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 7bdc88bf07cb -r ea5574252909 src/common/helpers.py --- a/src/common/helpers.py Fri Jun 12 18:17:19 2009 +0200 +++ b/src/common/helpers.py Mon Jun 15 09:10:16 2009 +0200 @@ -43,7 +43,6 @@ from i18n import Q_ from i18n import ngettext -import xmpp try: # Python 2.5 @@ -1272,6 +1271,7 @@ return keyID def update_optional_features(account = None): + import xmpp if account: accounts = [account] else:

1 0

gajim: Fixed log_calls decorator arguments in a few plugins. Fix...
by vardo＠lagaule.org 15 Jun '09

15 Jun '09

changeset 5878342c5d95 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5878342c5d95 description: Fixed log_calls decorator arguments in a few plugins. Fixed Acronyms Expander plugin (not working due to bad auto-merge). Added few comments. diffstat: plugins/dbus_plugin/plugin.py | 1 + plugins/events_dump/plugin.py | 5 +++-- plugins/google_translation/plugin.py | 6 ++++-- plugins/new_events_example/plugin.py | 5 +++-- src/chat_control.py | 9 +++++---- 5 files changed, 16 insertions(+), 10 deletions(-) diffs (116 lines): diff -r b604201bff04 -r 5878342c5d95 plugins/dbus_plugin/plugin.py --- a/plugins/dbus_plugin/plugin.py Sat Jun 13 23:25:46 2009 +0200 +++ b/plugins/dbus_plugin/plugin.py Mon Jun 15 07:56:08 2009 +0200 @@ -718,6 +718,7 @@ self.signal_object.remove_from_connection() self.signal_object = None + @log_calls('DBusPlugin') def _set_handling_methods(self): for event_name in self.events_names: setattr(self, event_name, diff -r b604201bff04 -r 5878342c5d95 plugins/events_dump/plugin.py --- a/plugins/events_dump/plugin.py Sat Jun 13 23:25:46 2009 +0200 +++ b/plugins/events_dump/plugin.py Mon Jun 15 07:56:08 2009 +0200 @@ -103,14 +103,15 @@ self.events_handlers = {} self._set_handling_methods() - @log_calls('DBusPlugin') + @log_calls('EventsDumpPlugin') def activate(self): pass - @log_calls('DBusPlugin') + @log_calls('EventsDumpPlugin') def deactivate(self): pass + @log_calls('EventsDumpPlugin') def _set_handling_methods(self): for event_name in self.events_names: setattr(self, event_name, diff -r b604201bff04 -r 5878342c5d95 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Sat Jun 13 23:25:46 2009 +0200 +++ b/plugins/google_translation/plugin.py Mon Jun 15 07:56:08 2009 +0200 @@ -63,6 +63,7 @@ self.translated_text_re = \ re.compile(r'google.language.callbacks.id100$\'22\',{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200$') + @log_calls('GoogleTranslationPlugin') def translate_text(self, text, from_lang, to_lang): text = self.prepare_text_for_url(text) headers = { 'User-Agent' : self.config['user_agent'] } @@ -76,6 +77,7 @@ return translated_text + @log_calls('GoogleTranslationPlugin') def prepare_text_for_url(self, text): ''' Converts text so it can be used within URL as query to Google Translate. @@ -90,11 +92,11 @@ return text - @log_calls('DBusPlugin') + @log_calls('GoogleTranslationPlugin') def activate(self): pass - @log_calls('DBusPlugin') + @log_calls('GoogleTranslationPlugin') def deactivate(self): pass diff -r b604201bff04 -r 5878342c5d95 plugins/new_events_example/plugin.py --- a/plugins/new_events_example/plugin.py Sat Jun 13 23:25:46 2009 +0200 +++ b/plugins/new_events_example/plugin.py Mon Jun 15 07:56:08 2009 +0200 @@ -81,11 +81,11 @@ #print "Event '%s' occured. Event object: %s\n\n===\n"%(event_object.name, #event_object - @log_calls('DBusPlugin') + @log_calls('NewEventsExamplePlugin') def activate(self): pass - @log_calls('DBusPlugin') + @log_calls('NewEventsExamplePlugin') def deactivate(self): pass @@ -137,6 +137,7 @@ self.from_jid = helpers.get_full_jid_from_iq(self.xmpp_msg) self.from_jid_without_resource = gajim.get_jid_without_resource(self.from_jid) self.account = unicode(self.xmpp_msg.attrs['to']) + # FIXME: KeyError: u'vardo(a)jabber.org/Gajim' self.from_nickname = gajim.get_contact_name_from_jid( self.account, self.from_jid_without_resource) diff -r b604201bff04 -r 5878342c5d95 src/chat_control.py --- a/src/chat_control.py Sat Jun 13 23:25:46 2009 +0200 +++ b/src/chat_control.py Mon Jun 15 07:56:08 2009 +0200 @@ -292,6 +292,10 @@ self.smooth = True self.msg_textview.grab_focus() + + # PluginSystem: adding GUI extension point for ChatControlBase + # instance object (also subclasses, eg. ChatControl or GroupchatControl) + gajim.plugin_manager.gui_extension_point('chat_control_base', self) def set_speller(self): try: @@ -334,10 +338,7 @@ menu.reorder_child(item, i) i += 1 menu.show_all() - - # PluginSystem: adding GUI extension point for ChatControlBase - # instance object (also subclasses, eg. ChatControl or GroupchatControl) - gajim.plugin_manager.gui_extension_point('chat_control_base', self) + def shutdown(self): # PluginSystem: removing GUI extension points connected with ChatControlBase

1 0

gajim: Merge plugin-system with default branch.
by vardo＠lagaule.org 13 Jun '09

13 Jun '09

changeset b604201bff04 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b604201bff04 description: Merge plugin-system with default branch. diffstat: Makefile.am | 9 +-------- README.html | 3 +-- configure.ac | 22 ---------------------- data/Makefile.am | 8 +------- po/POTFILES.skip | 1 + src/chat_control.py | 3 ++- src/gajim.py | 4 ++-- src/gtkgui_helpers.py | 10 ++++++++-- src/network_manager_listener.py | 14 ++++++++++---- 9 files changed, 26 insertions(+), 48 deletions(-) diffs (194 lines): diff -r ade272936a47 -r b604201bff04 Makefile.am --- a/Makefile.am Sun Jun 07 02:08:42 2009 +0200 +++ b/Makefile.am Sat Jun 13 23:25:46 2009 +0200 @@ -2,14 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -if BUILD_REMOTE_CONTROL -OPTIONAL_BIN = scripts/gajim-remote -else -OPTIONAL_BIN = -endif - -bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN) - +bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote docfilesdir = $(docdir) docfiles_DATA = README \ diff -r ade272936a47 -r b604201bff04 README.html --- a/README.html Sun Jun 07 02:08:42 2009 +0200 +++ b/README.html Sat Jun 13 23:25:46 2009 +0200 @@ -37,7 +37,7 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> @@ -55,7 +55,6 @@ <li>python-gtk2-dev</li> <li>libgtk2.0-dev aka. gtk2-devel</li> <li>libgtkspell-dev (for the gtkspell module)</li> -<li>libdbus-1-dev (for the remote control module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r ade272936a47 -r b604201bff04 configure.ac --- a/configure.ac Sun Jun 07 02:08:42 2009 +0200 +++ b/configure.ac Sat Jun 13 23:25:46 2009 +0200 @@ -45,27 +45,6 @@ PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFS) -dnl ***** -dnl dbus -dnl ***** -AC_ARG_ENABLE([remote], - [ --disable-remote disable remote control via DBus [default auto]], - enable_remote=$enableval, enable_remote=auto) - -if test "x$enable_remote" = "xauto"; then - PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no) -fi - -if test "x$enable_remote" = "xyes";then - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60]) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - have_remote=true -else - have_remote=false -fi -AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote) - AM_PATH_PYTHON([2.5]) if test "x$PYTHON" = "x:"; then AC_MSG_ERROR([Python not found]) @@ -184,7 +163,6 @@ echo " ***************************** Build features: - remote control ... ${have_remote} trayicon ......... ${have_trayicon} idle module OSX .. ${have_idle_osx} cocoa (OSX)....... ${have_cocoa} diff -r ade272936a47 -r b604201bff04 data/Makefile.am --- a/data/Makefile.am Sun Jun 07 02:08:42 2009 +0200 +++ b/data/Makefile.am Sat Jun 13 23:25:46 2009 +0200 @@ -14,13 +14,7 @@ otherdir = $(pkgdatadir)/data/other other_DATA = other/servers.xml other/cacerts.pem -if BUILD_REMOTE_CONTROL -OPTIONAL_MAN = gajim-remote.1 -else -OPTIONAL_MAN = -endif - -man_MANS = gajim.1 $(OPTIONAL_MAN) +man_MANS = gajim.1 gajim-remote.1 EXTRA_DIST = $(desktop_in_files) \ diff -r ade272936a47 -r b604201bff04 po/POTFILES.skip --- a/po/POTFILES.skip Sun Jun 07 02:08:42 2009 +0200 +++ b/po/POTFILES.skip Sat Jun 13 23:25:46 2009 +0200 @@ -1,2 +1,3 @@ data/gajim.desktop.in src/eggtrayicon.c +src/ipython_view.py diff -r ade272936a47 -r b604201bff04 src/chat_control.py --- a/src/chat_control.py Sun Jun 07 02:08:42 2009 +0200 +++ b/src/chat_control.py Sat Jun 13 23:25:46 2009 +0200 @@ -2524,8 +2524,9 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: + import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % constants.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r ade272936a47 -r b604201bff04 src/gajim.py --- a/src/gajim.py Sun Jun 07 02:08:42 2009 +0200 +++ b/src/gajim.py Sat Jun 13 23:25:46 2009 +0200 @@ -2609,8 +2609,8 @@ #FIXME: recognize xmpp: and treat it specially links = r"((?<=$)[A-Za-z][A-Za-z0-9\+\.\-]*:"\ - r"([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ - r"(?=\)))|([A-Za-z][A-Za-z0-9\+\.\-]*:([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" + r"([\w\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+"\ + r"(?=\)))|([A-Za-z][A-Za-z0-9\+\.\-]*:([\w\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" #2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]' diff -r ade272936a47 -r b604201bff04 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Jun 07 02:08:42 2009 +0200 +++ b/src/gtkgui_helpers.py Sat Jun 13 23:25:46 2009 +0200 @@ -962,11 +962,17 @@ '''initialise jabber_state_images dict''' iconset = gajim.config.get('iconset') if iconset: - path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - if not os.path.exists(path): + if helpers.get_iconset_path(iconset): + path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + if not os.path.exists(path): + iconset = gajim.config.DEFAULT_ICONSET + gajim.config.set('iconset', iconset) + else: iconset = gajim.config.DEFAULT_ICONSET + gajim.config.set('iconset', iconset) else: iconset = gajim.config.DEFAULT_ICONSET + gajim.config.set('iconset', iconset) path = os.path.join(helpers.get_iconset_path(iconset), '32x32') gajim.interface.jabber_state_images['32'] = load_iconset(path) diff -r ade272936a47 -r b604201bff04 src/network_manager_listener.py --- a/src/network_manager_listener.py Sun Jun 07 02:08:42 2009 +0200 +++ b/src/network_manager_listener.py Sat Jun 13 23:25:46 2009 +0200 @@ -24,6 +24,7 @@ import sys from common import gajim + def device_now_active(self, *args): '''For Network Manager 0.6''' for connection in gajim.connections.itervalues(): @@ -53,10 +54,15 @@ supported = False +from common import dbus_support + if sys.platform == 'darwin': supported = True -else: - try: +elif dbus_support.supported: + import dbus + import dbus.glib + + try: from common.dbus_support import system_bus bus = system_bus.bus() @@ -71,8 +77,8 @@ 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') supported = True - - except Exception: + + except dbus.DBusException: try: if 'org.freedesktop.NetworkManager' in bus.list_names(): supported = True

1 0

gajim: Fixes #4536. NM 0.7 was never used because NameError for ...
by vardo＠lagaule.org 13 Jun '09

13 Jun '09

changeset d90ab5f5e182 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d90ab5f5e182 description: Fixes #4536. NM 0.7 was never used because NameError for 'dbus' object was raised. Changed 'exception Exception' to catch only 'DBusException' from bus.get_object() method. diffstat: src/network_manager_listener.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diffs (40 lines): diff -r 284f6bb5e5dc -r d90ab5f5e182 src/network_manager_listener.py --- a/src/network_manager_listener.py Fri Jun 12 01:50:43 2009 +0200 +++ b/src/network_manager_listener.py Sat Jun 13 20:31:40 2009 +0200 @@ -24,6 +24,7 @@ import sys from common import gajim + def device_now_active(self, *args): '''For Network Manager 0.6''' for connection in gajim.connections.itervalues(): @@ -53,10 +54,15 @@ supported = False +from common import dbus_support + if sys.platform == 'darwin': supported = True -else: - try: +elif dbus_support.supported: + import dbus + import dbus.glib + + try: from common.dbus_support import system_bus bus = system_bus.bus() @@ -71,8 +77,8 @@ 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') supported = True - - except Exception: + + except dbus.DBusException: try: if 'org.freedesktop.NetworkManager' in bus.list_names(): supported = True

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009