gajim: Fix last merge. - Commits

26 Dec 2009

changeset 91e62efdb6b8 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=91e62efdb6b8
description: Fix last merge.
diffstat:
extra.mk.in               |  1 -
 src/Makefile              |  3 +--
 src/common/Makefile       |  1 -
 src/common/configpaths.py |  2 +-
 src/gui_interface.py      |  4 ++++
 5 files changed, 6 insertions(+), 5 deletions(-)
diffs (64 lines):
diff -r 37fde3b2545b -r 91e62efdb6b8 extra.mk.in

--- a/extra.mk.in	Sat Dec 19 13:30:03 2009 +0100
+++ b/extra.mk.in	Sat Dec 26 12:50:17 2009 +0100
@@ -1,4 +1,3 @@
-TRAYMODULE = @TRAYMODULE@
 OSX_IDLEMODULE = @OSX_IDLEMODULE@
 OSX_MODULES = @OSX_MODULES@
 PYTHON_CFLAGS = @PYTHON_INCLUDES@
diff -r 37fde3b2545b -r 91e62efdb6b8 src/Makefile
--- a/src/Makefile	Sat Dec 19 13:30:03 2009 +0100
+++ b/src/Makefile	Sat Dec 26 12:50:17 2009 +0100
@@ -1,6 +1,6 @@
 include ../extra.mk
-SUBDIRS = common ${TRAYMODULE} osx
+SUBDIRS = common osx
SRCS = adhoc_commands.py		\
        advanced_configuration_window.py	\
@@ -41,7 +41,6 @@
        secrets.py			\
        session.py			\
        statusicon.py			\
-       systray.py			\
        tooltips.py			\
        vcard.py
 DISTCLEAN = trayicon.so
diff -r 37fde3b2545b -r 91e62efdb6b8 src/common/Makefile
--- a/src/common/Makefile	Sat Dec 19 13:30:03 2009 +0100
+++ b/src/common/Makefile	Sat Dec 26 12:50:17 2009 +0100
@@ -6,7 +6,6 @@
        GnuPGInterface.py	\
        __init__.py		\
        atom.py			\
-       caps.py			\
        check_paths.py		\
        commands.py		\
        config.py		\
diff -r 37fde3b2545b -r 91e62efdb6b8 src/common/configpaths.py
--- a/src/common/configpaths.py	Sat Dec 19 13:30:03 2009 +0100
+++ b/src/common/configpaths.py	Sat Dec 26 12:50:17 2009 +0100
@@ -123,7 +123,7 @@
    		self.add('DATA', os.path.join(u'..', windowsify(u'data')))
    	if 'GAJIM_ICONDIR' in os.environ:
    		self.add('ICONS', fse(os.environ['GAJIM_ICONDIR']))
-		else
+		else:
    		self.add('ICONS', os.path.join(u'..', windowsify(u'icons')))
    	self.add('HOME', fse(os.path.expanduser('~')))
    	try:
diff -r 37fde3b2545b -r 91e62efdb6b8 src/gui_interface.py
--- a/src/gui_interface.py	Sat Dec 19 13:30:03 2009 +0100
+++ b/src/gui_interface.py	Sat Dec 26 12:50:17 2009 +0100
@@ -3379,6 +3379,10 @@
    	import statusicon
    	self.systray = statusicon.StatusIcon()
+		if sys.platform == 'darwin':
+			import dock
+			self.dock = dock.Dock()
+
    	pix = gtkgui_helpers.get_icon_pixmap('gajim', 32)
    	# set the icon to all windows
    	gtk.window_set_default_icon(pix)

    