gajim: prevent traceback If the gajim icon is absent

2011-02-21 Thread Denis Fomin 
changeset 913f18edc7d7 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=913f18edc7d7
description: prevent traceback If the gajim icon is absent

diffstat:

 src/gui_interface.py |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r a98e1d445d62 -r 913f18edc7d7 src/gui_interface.py
--- a/src/gui_interface.py  Mon Feb 21 18:11:47 2011 +0300
+++ b/src/gui_interface.py  Mon Feb 21 23:52:16 2011 +0300
@@ -2779,8 +2779,9 @@
 self.systray = statusicon.StatusIcon()
 
 pix = gtkgui_helpers.get_icon_pixmap('gajim', 32)
-# set the icon to all windows
-gtk.window_set_default_icon(pix)
+if pix is not None:
+# set the icon to all windows
+gtk.window_set_default_icon(pix)
 
 self.init_emoticons()
 self.make_regexps()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: Delete gajim-remote-plugin.Fixes #6115

2011-02-21 Thread Denis Fomin 
changeset a98e1d445d62 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=a98e1d445d62
description: Delete gajim-remote-plugin.Fixes #6115

diffstat:

 src/gajim-remote-plugin.py |  620 -
 1 files changed, 0 insertions(+), 620 deletions(-)

diffs (truncated from 624 to 300 lines):

diff -r 72272e2ae478 -r a98e1d445d62 src/gajim-remote-plugin.py
--- a/src/gajim-remote-plugin.pyFri Feb 18 17:04:27 2011 +0100
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,620 +0,0 @@
-#!/usr/bin/env python
-##
-## Copyright (C) 2005-2006 Dimitur Kirov 
-## Nikos Kouremenos 
-## Copyright (C) 2005-2010 Yann Leboulanger 
-## Copyright (C) 2006 Junglecow 
-##Travis Shirk 
-## Copyright (C) 2006-2008 Jean-Marie Traissard 
-## Copyright (C) 2007 Julien Pivotto 
-##
-## 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 .
-##
-
-# gajim-remote help will show you the D-BUS API of Gajim
-
-import sys
-import os
-import locale
-import urllib
-import signal
-signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application
-
-from common import exceptions
-from common import i18n # This installs _() function
-
-try:
-PREFERRED_ENCODING = locale.getpreferredencoding()
-except Exception:
-PREFERRED_ENCODING = 'UTF-8'
-
-def send_error(error_message):
-'''Writes error message to stderr and exits'''
-print >> sys.stderr, error_message.encode(PREFERRED_ENCODING)
-sys.exit(1)
-
-try:
-if sys.platform == 'darwin':
-import osx.dbus
-osx.dbus.load(False)
-import dbus
-import dbus.service
-import dbus.glib
-except:
-print str(exceptions.DbusNotSupported())
-sys.exit(1)
-
-OBJ_PATH = '/org/gajim/dbusplugin/RemoteObject'
-INTERFACE = 'org.gajim.dbusplugin.RemoteInterface'
-SERVICE = 'org.gajim.dbusplugin'
-BASENAME = 'gajim-remote-plugin'
-
-
-class GajimRemote:
-
-def __init__(self):
-self.argv_len = len(sys.argv)
-# define commands dict. Prototype :
-# {
-#   'command': [comment, [list of arguments] ]
-# }
-#
-# each argument is defined as a tuple:
-#(argument name, help on argument, is mandatory)
-#
-self.commands = {
-'help': [
-_('Shows a help on specific command'),
-[
-#User gets help for the command, 
specified by this parameter
-(_('command'),
-_('show help on command'), False)
-]
-],
-'toggle_roster_appearance': [
-_('Shows or hides the roster window'),
-[]
-],
-'show_next_pending_event': [
-_('Pops up a window with the next pending 
event'),
-[]
-],
-'list_contacts': [
-_('Prints a list of all contacts in the 
roster. Each contact '
-'appears on a separate line'),
-[
-(_('account'), _('show only contacts 
of the given account'),
-False)
-]
-
-],
-'list_accounts': [
-_('Prints a list of registered accounts'),
-[]
-],
-'change_status': [
-_('Changes the status of account or accounts'),
-[
-#offline, online, chat, away, xa, dnd, invisible should not be translated
-(_('status'), _('one of: offline, 
online, chat, away, xa, dnd, invisible. If not set, use account\'s previous 
status'), False),
-(_('message'), _('status message'), 
False),
-(_('account'), _('change status of 
account "account". '
-'If not specified, try to change status of all accounts that have '
-'"sync with global status" option