Commits February 2011

commits@gajim.org

2 participants
12 discussions

gajim: [Jonathan Wehrle] german translation fix
by Denis Fomin 23 Feb '11

23 Feb '11

changeset 347a8a220342 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=347a8a220342 description: [Jonathan Wehrle] german translation fix diffstat: po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 913f18edc7d7 -r 347a8a220342 po/de.po --- a/po/de.po Mon Feb 21 23:52:16 2011 +0300 +++ b/po/de.po Wed Feb 23 20:46:50 2011 +0300 @@ -9114,7 +9114,7 @@ #: ../src/groupchat_control.py:1481 #, python-format msgid "** Affiliation of %(nick)s has been set to %(affiliation)s" -msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet" +msgstr "** Mitgliedschaft von %(nick)s wurde auf %(affiliation)s gesetzt" #: ../src/groupchat_control.py:1496 #, python-format

1 0

gajim: prevent traceback If the gajim icon is absent
by Denis Fomin 21 Feb '11

21 Feb '11

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

1 0

gajim: Delete gajim-remote-plugin.Fixes #6115
by Denis Fomin 21 Feb '11

21 Feb '11

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.py Fri Feb 18 17:04:27 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,620 +0,0 @@ -#!/usr/bin/env python -## -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2010 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2006 Junglecow <junglecow AT gmail.com> -## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> -## -## 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/>. -## - -# 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 set'), False) - ] - ], - 'set_priority': [ - _('Changes the priority of account or accounts'), - [ - (_('priority'), _('priority you want to give to the account'), - True), - (_('account'), _('change the priority of the given account. ' - 'If not specified, change status of all accounts that have' - ' "sync with global status" option set'), False) - ] - ], - 'open_chat': [ - _('Shows the chat dialog so that you can send messages to a contact'), - [ - ('jid', _('JID of the contact that you want to chat with'), - True), - (_('account'), _('if specified, contact is taken from the ' - 'contact list of this account'), False), - (_('message'), - _('message content. The account must be specified or ""'), - False) - ] - ], - 'send_chat_message': [ - _('Sends new chat message to a contact in the roster. Both OpenPGP key ' - 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), - [ - ('jid', _('JID of the contact that will receive the message'), True), - (_('message'), _('message contents'), True), - (_('pgp key'), _('if specified, the message will be encrypted ' - 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' - 'using this account'), False), - ] - ], - 'send_single_message': [ - _('Sends new single message to a contact in the roster. Both OpenPGP key ' - 'and account are optional. If you want to set only \'account\', ' - 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), - [ - ('jid', _('JID of the contact that will receive the message'), True), - (_('subject'), _('message subject'), True), - (_('message'), _('message contents'), True), - (_('pgp key'), _('if specified, the message will be encrypted ' - 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' - 'using this account'), False), - ] - ], - 'send_groupchat_message': [ - _('Sends new message to a groupchat you\'ve joined.'), - [ - ('room_jid', _('JID of the room that will receive the message'), True), - (_('message'), _('message contents'), True), - (_('account'), _('if specified, the message will be sent ' - 'using this account'), False), - ] - ], - 'contact_info': [ - _('Gets detailed info on a contact'), - [ - ('jid', _('JID of the contact'), True) - ] - ], - 'account_info': [ - _('Gets detailed info on a account'), - [ - ('account', _('Name of the account'), True) - ] - ], - 'send_file': [ - _('Sends file to a contact'), - [ - (_('file'), _('File path'), True), - ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, file will be sent using this ' - 'account'), False) - ] - ], - 'prefs_list': [ - _('Lists all preferences and their values'), - [ ] - ], - 'prefs_put': [ - _('Sets value of \'key\' to \'value\'.'), - [ - (_('key=value'), _('\'key\' is the name of the preference, ' - '\'value\' is the value to set it to'), True) - ] - ], - 'prefs_del': [ - _('Deletes a preference item'), - [ - (_('key'), _('name of the preference to be deleted'), True) - ] - ], - 'prefs_store': [ - _('Writes the current state of Gajim preferences to the .config ' - 'file'), - [ ] - ], - 'remove_contact': [ - _('Removes contact from roster'), - [ - ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, contact is taken from the ' - 'contact list of this account'), False) - - ] - ], - 'add_contact': [ - _('Adds contact to roster'), - [ - (_('jid'), _('JID of the contact'), True), - (_('account'), _('Adds new contact to this account'), False) - ] - ], - - 'get_status': [ - _('Returns current status (the global one unless account is specified)'), - [ - (_('account'), '', False) - ] - ], - - 'get_status_message': [ - _('Returns current status message (the global one unless account is specified)'), - [ - (_('account'), '', False) - ] - ], - - 'get_unread_msgs_number': [ - _('Returns number of unread messages'), - [ ] - ], - 'start_chat': [ - _('Opens \'Start Chat\' dialog'), - [ - (_('account'), _('Starts chat, using this account'), True) - ] - ], - 'send_xml': [ - _('Sends custom XML'), - [ - ('xml', _('XML to send'), True), - ('account', _('Account in which the xml will be sent; ' - 'if not specified, xml will be sent to all accounts'), - False) - ] - ], - 'change_avatar': [ - _('Change the avatar'), - [ - ('picture', _('Picture to use'), True), - ('account', _('Account in which the avatar will be set; ' - 'if not specified, the avatar will be set for all accounts'), - False) - ] - ], - 'handle_uri': [ - _('Handle a xmpp:/ uri'), - [ - (_('uri'), _('URI to handle'), True), - (_('account'), _('Account in which you want to handle it'), - False), - (_('message'), _('Message content'), False) - ] - ], - 'join_room': [ - _('Join a MUC room'), - [ - (_('room'), _('Room JID'), True), - (_('nick'), _('Nickname to use'), False), - (_('password'), _('Password to enter the room'), False), - (_('account'), _('Account from which you want to enter the ' - 'room'), False) - ] - ],

1 0

gajim: ability to send messages to a group, even if it contains ...
by Yann Leboulanger 18 Feb '11

18 Feb '11

changeset 72272e2ae478 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=72272e2ae478 description: ability to send messages to a group, even if it contains offline contacts. Fixes #6761 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3dbe6c942ece -r 72272e2ae478 src/dialogs.py --- a/src/dialogs.py Fri Feb 18 14:41:16 2011 +0100 +++ b/src/dialogs.py Fri Feb 18 17:04:27 2011 +0100 @@ -2859,7 +2859,7 @@ self.close_button = self.xml.get_object('close_button') self.message_tv_buffer.connect('changed', self.update_char_counter) if isinstance(to, list): - jid = ', '.join( [i[0].jid + '/' + i[0].resource for i in to]) + jid = ', '.join( [i[0].get_full_jid() for i in to]) self.to_entry.set_text(jid) self.to_entry.set_sensitive(False) else:

1 0

gajim: don't use a reserved word as variable name
by Yann Leboulanger 18 Feb '11

18 Feb '11

changeset 3dbe6c942ece in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3dbe6c942ece description: don't use a reserved word as variable name diffstat: src/conversation_textview.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 5f9fe29b58ea -r 3dbe6c942ece src/conversation_textview.py --- a/src/conversation_textview.py Tue Feb 08 21:26:20 2011 +0300 +++ b/src/conversation_textview.py Fri Feb 18 14:41:16 2011 +0100 @@ -1296,7 +1296,7 @@ Get the time, with the day before if needed and return it. It DOESN'T format a fuzzy time """ - format = '' + format_ = '' # get difference in days since epoch (86400 = 24*3600) # number of days since epoch for current time (in GMT) - # number of days since epoch for message (in GMT) @@ -1309,11 +1309,11 @@ day_str = i18n.ngettext('Yesterday', '%i days ago', diff_day, replace_plural=diff_day) if day_str: - format += day_str + ' ' + format_ += day_str + ' ' timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) - format += timestamp_str - tim_format = time.strftime(format, tim) + format_ += timestamp_str + tim_format = time.strftime(format_, tim) if locale.getpreferredencoding() != 'KOI8-R': # if tim_format comes as unicode because of day_str. # we convert it to the encoding that we want (and that is utf-8)

1 0

gajim: Fixes previous commit
by Denis Fomin 08 Feb '11

08 Feb '11

changeset 5f9fe29b58ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f9fe29b58ea description: Fixes previous commit diffstat: src/groupchat_control.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (22 lines): diff -r e8964fbbf0f1 -r 5f9fe29b58ea src/groupchat_control.py --- a/src/groupchat_control.py Tue Feb 08 19:04:18 2011 +0300 +++ b/src/groupchat_control.py Tue Feb 08 21:26:20 2011 +0300 @@ -555,9 +555,6 @@ """ The MUC treeview has resized. Move the hpaned in all tabs to match """ - def reset_flag(): - self.resize_from_another_muc = True - if gparamspec.name != 'position': return if not self.resize_from_another_muc: @@ -577,7 +574,7 @@ if ctrl and gajim.config.get('one_message_window') != 'never': ctrl.resize_from_another_muc = False ctrl.hpaned.set_position(hpaned_position) - gobject.idle_add(reset_flag) + ctrl.resize_from_another_muc = True def iter_contact_rows(self): """

1 0

gajim: fixed incorrect width of conference participants list, wh...
by Denis Fomin 08 Feb '11

08 Feb '11

changeset e8964fbbf0f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e8964fbbf0f1 description: fixed incorrect width of conference participants list, when joining a new room and when manually resizing/maximizing gajim window in all-in-one mode diffstat: data/gui/groupchat_control.ui | 1 + src/groupchat_control.py | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diffs (93 lines): diff -r b604cdba3651 -r e8964fbbf0f1 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sun Feb 06 00:07:46 2011 +0100 +++ b/data/gui/groupchat_control.ui Tue Feb 08 19:04:18 2011 +0300 @@ -85,6 +85,7 @@ <property name="border_width">3</property> <property name="position">495</property> <property name="position_set">True</property> + <signal name="notify" handler="on_hpaned_notify"/> <child> <object class="GtkVBox" id="gc_textviews_vbox"> <property name="width_request">0</property> diff -r b604cdba3651 -r e8964fbbf0f1 src/groupchat_control.py --- a/src/groupchat_control.py Sun Feb 06 00:07:46 2011 +0100 +++ b/src/groupchat_control.py Tue Feb 08 19:04:18 2011 +0300 @@ -377,11 +377,6 @@ self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') - # set the position of the current hpaned - hpaned_position = gajim.config.get('gc-hpaned-position') - self.hpaned = self.xml.get_object('hpaned') - self.hpaned.set_position(hpaned_position) - self.list_treeview = self.xml.get_object('list_treeview') selection = self.list_treeview.get_selection() id_ = selection.connect('changed', @@ -390,13 +385,17 @@ id_ = self.list_treeview.connect('style-set', self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview - self.resize_from_another_muc = False + self.resize_from_another_muc = True # we want to know when the the widget resizes, because that is # an indication that the hpaned has moved... - # FIXME: Find a better indicator that the hpaned has moved. - id_ = self.list_treeview.connect('size-allocate', - self.on_treeview_size_allocate) - self.handlers[id_] = self.list_treeview + self.hpaned = self.xml.get_object('hpaned') + id_ = self.hpaned.connect('notify', self.on_hpaned_notify) + self.handlers[id_] = self.hpaned + + # set the position of the current hpaned + hpaned_position = gajim.config.get('gc-hpaned-position') + self.hpaned.set_position(hpaned_position) + #status_image, shown_nick, type, nickname, avatar self.columns = [gtk.Image, str, str, str, gtk.gdk.Pixbuf] store = gtk.TreeStore(*self.columns) @@ -552,23 +551,21 @@ menu.show_all() - def resize_occupant_treeview(self, position): - self.resize_from_another_muc = True - self.hpaned.set_position(position) - def reset_flag(): - self.resize_from_another_muc = False - # Reset the flag when everything will be redrawn, and in particular when - # on_treeview_size_allocate will have been called. - gobject.idle_add(reset_flag) - - def on_treeview_size_allocate(self, widget, allocation): + def on_hpaned_notify(self, pane, gparamspec): """ The MUC treeview has resized. Move the hpaned in all tabs to match """ - if self.resize_from_another_muc: + def reset_flag(): + self.resize_from_another_muc = True + + if gparamspec.name != 'position': + return + if not self.resize_from_another_muc: # Don't send the event to other MUC return + hpaned_position = self.hpaned.get_position() + gajim.config.set('gc-hpaned-position', hpaned_position) for account in gajim.gc_connected: for room_jid in [i for i in gajim.gc_connected[account] if \ gajim.gc_connected[account][i] and i != self.room_jid]: @@ -578,7 +575,9 @@ gajim.interface.minimized_controls[account]: ctrl = gajim.interface.minimized_controls[account][room_jid] if ctrl and gajim.config.get('one_message_window') != 'never': - ctrl.resize_occupant_treeview(hpaned_position) + ctrl.resize_from_another_muc = False + ctrl.hpaned.set_position(hpaned_position) + gobject.idle_add(reset_flag) def iter_contact_rows(self): """

1 0

gajim: don't fail zeroconf with non-ascii hostname
by Yann Leboulanger 05 Feb '11

05 Feb '11

changeset b604cdba3651 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b604cdba3651 description: don't fail zeroconf with non-ascii hostname diffstat: src/common/zeroconf/connection_zeroconf.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 4fcf8fb51017 -r b604cdba3651 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Fri Feb 04 23:52:03 2011 +0300 +++ b/src/common/zeroconf/connection_zeroconf.py Sun Feb 06 00:07:46 2011 +0100 @@ -87,8 +87,7 @@ 'is_zeroconf', True) gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'use_ft_proxies', False) - #XXX make sure host is US-ASCII - self.host = unicode(socket.gethostname()) + self.host = unicode(socket.gethostname(), locale.getpreferredencoding()) gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, 'hostname', self.host) self.port = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME,

1 0

gajim: Added 'show roster on startup' option. Fixes #6793
by Denis Fomin 04 Feb '11

04 Feb '11

changeset 4fcf8fb51017 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4fcf8fb51017 description: Added 'show roster on startup' option. Fixes #6793 diffstat: data/gui/preferences_window.ui | 66 +++++++++++++++++++++++++++++++++++++---- src/common/config.py | 4 +- src/config.py | 15 +++++++++ src/roster_window.py | 12 +++++-- 4 files changed, 85 insertions(+), 12 deletions(-) diffs (204 lines): diff -r d49419051d6b -r 4fcf8fb51017 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Feb 04 14:15:56 2011 +0300 +++ b/data/gui/preferences_window.ui Fri Feb 04 23:52:03 2011 +0300 @@ -107,6 +107,23 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore7"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Always</col> + </row> + <row> + <col id="0" translatable="yes">Never</col> + </row> + <row> + <col id="0" translatable="yes">Last state</col> + </row> + </data> + </object> <object class="GtkWindow" id="preferences_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> @@ -332,7 +349,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -391,8 +408,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -409,8 +426,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -426,8 +443,8 @@ </object> <packing> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -451,6 +468,41 @@ <property name="bottom_attach">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Show roster on startup:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">show_roster_on_startup</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="show_roster_on_startup"> + <property name="width_request">50</property> + <property name="visible">True</property> + <property name="model">liststore7</property> + <signal name="changed" handler="on_show_roster_on_startup_changed"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext7"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> </object> </child> </object> diff -r d49419051d6b -r 4fcf8fb51017 src/common/config.py --- a/src/common/config.py Fri Feb 04 14:15:56 2011 +0300 +++ b/src/common/config.py Fri Feb 04 23:52:03 2011 +0300 @@ -52,6 +52,7 @@ opt_bool = [ 'boolean', 0 ] opt_color = [ 'color', '^(#[0-9a-fA-F]{6})|()$' ] opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype'] +opt_show_roster_on_startup = ['always', 'never', 'last_state'] opt_treat_incoming_messages = ['', 'chat', 'normal'] class Config: @@ -171,7 +172,7 @@ 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], - 'show_roster_on_startup': [opt_bool, True], + 'last_roster_visible': [opt_bool, True], 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [ opt_str, defs.version ], # which version created the config 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'], @@ -244,6 +245,7 @@ 'one_message_window': [opt_str, 'always', #always, never, peracct, pertype should not be translated _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window.')], + 'show_roster_on_startup':[opt_str, 'always', _('Show roster on startup.\n\'always\' - Always show roster.\n\'never\' - Never show roster.\n\'last_state\' - Restore the last state roster.')], 'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')], 'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')], 'compact_view': [opt_bool, False, _('Hides the buttons in chat windows.')], diff -r d49419051d6b -r 4fcf8fb51017 src/config.py --- a/src/config.py Fri Feb 04 14:15:56 2011 +0300 +++ b/src/config.py Fri Feb 04 23:52:03 2011 +0300 @@ -183,6 +183,15 @@ else: self.one_window_type_combobox.set_active(0) + # Show roster on startup + show_roster_combobox = self.xml.get_object('show_roster_on_startup') + choices = common.config.opt_show_roster_on_startup + type_ = gajim.config.get('show_roster_on_startup') + if type_ in choices: + show_roster_combobox.set_active(choices.index(type_)) + else: + show_roster_combobox.set_active(0) + # Compact View st = gajim.config.get('compact_view') self.xml.get_object('compact_view_checkbutton').set_active(st) @@ -685,6 +694,12 @@ gajim.interface.save_config() gajim.interface.msg_win_mgr.reconfig() + def on_show_roster_on_startup_changed(self, widget): + active = widget.get_active() + config_type = common.config.opt_show_roster_on_startup[active] + gajim.config.set('show_roster_on_startup', config_type) + gajim.interface.save_config() + def on_compact_view_checkbutton_toggled(self, widget): active = widget.get_active() for ctrl in self._get_all_controls(): diff -r d49419051d6b -r 4fcf8fb51017 src/roster_window.py --- a/src/roster_window.py Fri Feb 04 14:15:56 2011 +0300 +++ b/src/roster_window.py Fri Feb 04 23:52:03 2011 +0300 @@ -2349,7 +2349,7 @@ # then we want to save (i.e. the window will grow every startup) # so adjust. msgwin_width_adjust = -1 * width - gajim.config.set('show_roster_on_startup', + gajim.config.set('last_roster_visible', self.window.get_property('visible')) gajim.interface.msg_win_mgr.shutdown(msgwin_width_adjust) @@ -6310,13 +6310,17 @@ self._toggeling_row = False self.setup_and_draw_roster() - if gajim.config.get('show_roster_on_startup'): + if gajim.config.get('show_roster_on_startup') == 'always': self.window.show_all() - else: + elif gajim.config.get('show_roster_on_startup') == 'never': if gajim.config.get('trayicon') != 'always': # Without trayicon, user should see the roster! self.window.show_all() - gajim.config.set('show_roster_on_startup', True) + gajim.config.set('last_roster_visible', True) + else: + if gajim.config.get('last_roster_visible') or \ + gajim.config.get('trayicon') != 'always': + self.window.show_all() if len(gajim.connections) == 0: # if we have no account def _open_wizard():

1 0

gajim: Correct gst-python detect(without gst-python is gajim una...
by Denis Fomin 04 Feb '11

04 Feb '11

changeset d49419051d6b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d49419051d6b description: Correct gst-python detect(without gst-python is gajim unable to load preferences dialog) diffstat: src/common/multimedia_helpers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8f3e18f4032c -r d49419051d6b src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Thu Feb 03 22:55:39 2011 +0300 +++ b/src/common/multimedia_helpers.py Fri Feb 04 14:15:56 2011 +0300 @@ -44,6 +44,8 @@ element.set_state(gst.STATE_NULL) else: self.devices[text] = pipe % name + except ImportError: + pass except gst.ElementNotFoundError: print 'element \'%s\' not found' % name

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2011