gajim: Remove all OS X-specific code from the default branch.

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@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()