Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: * in order to permit roster loading at gajim startup we n...
by Anaël Verrier 30 Jun '09

30 Jun '09

changeset 58423f293e42 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=58423f293e42 description: * in order to permit roster loading at gajim startup we need to save all roster pushs (even if it's not for versioning) X-Hg-Repo: gajim Subject: gajim: * In order to allow the viewing of the roster when we are offline (and some other cool stuffs), with and without roster versioning, now we load roster when RosterWindow is created (at gajim startup). Fixes #3190 From: Anaël Verrier <elghinn(a)free.fr> changeset ce797a2b9b5d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce797a2b9b5d description: * In order to allow the viewing of the roster when we are offline (and some other cool stuffs), with and without roster versioning, now we load roster when RosterWindow is created (at gajim startup). Fixes #3190 X-Hg-Repo: gajim Subject: gajim: * now there is no more sparkling when we update the RosterWindow with the roster received from the server (when server does not handle roster versioning or when it resends the whole roster) From: Anaël Verrier <elghinn(a)free.fr> changeset 32f971500155 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=32f971500155 description: * now there is no more sparkling when we update the RosterWindow with the roster received from the server (when server does not handle roster versioning or when it resends the whole roster) diffstat: src/common/connection_handlers.py | 19 ++++++++++++++----- src/common/xmpp/roster_nb.py | 2 ++ src/gajim.py | 1 + src/roster_window.py | 5 +++++ 4 files changed, 22 insertions(+), 5 deletions(-) diffs (90 lines): diff -r 6771b91032cd -r 32f971500155 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 28 20:43:18 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jun 30 17:06:17 2009 +0200 @@ -1562,10 +1562,10 @@ for group in item.getTags('group'): groups.append(group.getData()) self.dispatch('ROSTER_INFO', (jid, name, sub, ask, groups)) + account_jid = gajim.get_jid_from_account(self.name) + gajim.logger.add_or_update_contact(account_jid, jid, name, sub, ask, + groups) if version: - account_jid = gajim.get_jid_from_account(self.name) - gajim.logger.add_or_update_contact(account_jid, jid, name, sub, - ask, groups) gajim.config.set_per('accounts', self.name, 'roster_version', version) if not self.connection or self.connected < 2: @@ -2452,6 +2452,7 @@ def _on_roster_set(self, roster): roster_version = roster.version + received_from_server = roster.received_from_server raw_roster = roster.getRaw() roster = {} our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name)) @@ -2490,9 +2491,17 @@ # we can't determine which iconset to use self.discoverInfo(jid) - self.dispatch('ROSTER', roster) gajim.logger.replace_roster(self.name, roster_version, roster) - print raw_roster + if received_from_server: + for contact in gajim.contacts.iter_contacts(self.name): + if contact.jid not in roster: + self.dispatch('ROSTER_INFO', (self.name, + (contact.jid, None, None, None, ()))) + for jid in roster: + self.dispatch('ROSTER_INFO', (jid, roster[jid]['name'], + roster[jid]['subscription'], roster[jid]['ask'], + roster[jid]['groups'])) + #self.dispatch('ROSTER', roster) def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0] diff -r 6771b91032cd -r 32f971500155 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Sun Jun 28 20:43:18 2009 +0200 +++ b/src/common/xmpp/roster_nb.py Tue Jun 30 17:06:17 2009 +0200 @@ -43,6 +43,7 @@ self._data = {} self.set=None self._exported_methods=[self.getRoster] + self.received_from_server = False def Request(self,force=0): ''' Request roster from server if it were not yet requested @@ -67,6 +68,7 @@ return query = stanza.getTag('query') if query: + self.received_from_server = True self.version = stanza.getTagAttr('query', 'ver') if self.version is None: self.version = '' diff -r 6771b91032cd -r 32f971500155 src/gajim.py --- a/src/gajim.py Sun Jun 28 20:43:18 2009 +0200 +++ b/src/gajim.py Tue Jun 30 17:06:17 2009 +0200 @@ -3423,6 +3423,7 @@ gtk.window_set_default_icon(pix) self.roster = roster_window.RosterWindow() + self.roster.init_roster() self.init_emoticons() self.make_regexps() diff -r 6771b91032cd -r 32f971500155 src/roster_window.py --- a/src/roster_window.py Sun Jun 28 20:43:18 2009 +0200 +++ b/src/roster_window.py Tue Jun 30 17:06:17 2009 +0200 @@ -6176,6 +6176,11 @@ # #self.xml.get_widget('menubar').hide() # return + def init_roster(self): + for account in gajim.connections: + roster = gajim.logger.get_roster(gajim.get_jid_from_account(account)) + gajim.handlers['ROSTER'](account, roster) + ################################################################################ ### ################################################################################

1 0

gajim: finish previous
by Yann Leboulanger 29 Jun '09

29 Jun '09

changeset 44f80ad632b1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44f80ad632b1 description: finish previous X-Hg-Repo: gajim Subject: gajim: finish previous commit, and change to a more generic name From: Yann Leboulanger <asterix(a)lagaule.org> changeset 08f8027d91bc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=08f8027d91bc description: finish previous commit, and change to a more generic name diffstat: configure.ac | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r f2c5deb1aa25 -r 08f8027d91bc configure.ac --- a/configure.ac Mon Jun 29 23:02:03 2009 +0200 +++ b/configure.ac Mon Jun 29 23:10:30 2009 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.5-svn],[http://trac.gajim.org/],[gajim]) + [0.12.1.5-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r f2c5deb1aa25 -r 08f8027d91bc src/common/defs.py --- a/src/common/defs.py Mon Jun 29 23:02:03 2009 +0200 +++ b/src/common/defs.py Mon Jun 29 23:10:30 2009 +0200 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.12.1.5-hg' +version = '0.12.1.5-dev' import sys, os.path for base in ('.', 'common'):

1 0

gajim: Change the -svn suffix to -hg.
by Jonathan Schleifer 29 Jun '09

29 Jun '09

changeset f2c5deb1aa25 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2c5deb1aa25 description: Change the -svn suffix to -hg. diffstat: src/common/defs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 49c34a7dae36 -r f2c5deb1aa25 src/common/defs.py --- a/src/common/defs.py Mon Jun 29 07:57:10 2009 +0200 +++ b/src/common/defs.py Mon Jun 29 23:02:03 2009 +0200 @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.12.1.5-svn' +version = '0.12.1.5-hg' import sys, os.path for base in ('.', 'common'):

1 0

gajim: Merge changes from default branch into osx_newbuildsys.
by Jonathan Schleifer 29 Jun '09

29 Jun '09

changeset 482d9e3c2c6f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=482d9e3c2c6f description: Merge changes from default branch into osx_newbuildsys. diffstat: .hgignore | 27 + THANKS.artists | 1 + autogen.sh | 4 +- configure.ac | 2 +- data/glade/gc_occupants_menu.glade | 30 +- data/glade/roster_item_exchange_window.glade | 110 ++ data/iconsets/transports/facebook/16x16/away.png | data/iconsets/transports/facebook/16x16/chat.png | data/iconsets/transports/facebook/16x16/dnd.png | data/iconsets/transports/facebook/16x16/not_in_roster.png | data/iconsets/transports/facebook/16x16/offline.png | data/iconsets/transports/facebook/16x16/online.png | data/iconsets/transports/facebook/16x16/xa.png | data/iconsets/transports/facebook/32x32/away.png | data/iconsets/transports/facebook/32x32/chat.png | data/iconsets/transports/facebook/32x32/dnd.png | data/iconsets/transports/facebook/32x32/not_in_roster.png | data/iconsets/transports/facebook/32x32/offline.png | data/iconsets/transports/facebook/32x32/online.png | data/iconsets/transports/facebook/32x32/xa.png | data/iconsets/transports/facebook/48x48/offline.png | data/iconsets/transports/facebook/48x48/online.png | data/pixmaps/agents/facebook.png | src/adhoc_commands.py | 5 +- src/advanced.py | 2 +- src/chat_control.py | 14 +- src/common/connection_handlers.py | 31 + src/common/gajim.py | 8 +- src/config.py | 10 + src/dialogs.py | 759 ++++++++++++------- src/disco.py | 45 +- src/gajim.py | 6 + src/groupchat_control.py | 88 ++- src/roster_window.py | 18 +- src/vcard.py | 2 - 35 files changed, 865 insertions(+), 297 deletions(-) diffs (truncated from 2576 to 300 lines): diff -r 0d4b26c00c1c -r 482d9e3c2c6f .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jun 29 22:30:04 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 0d4b26c00c1c -r 482d9e3c2c6f THANKS.artists --- a/THANKS.artists Mon Jun 15 23:47:54 2009 +0200 +++ b/THANKS.artists Mon Jun 29 22:30:04 2009 +0200 @@ -5,3 +5,4 @@ Josef Vybíral Membris Khan Rederick Asher +Jakub Szypulka diff -r 0d4b26c00c1c -r 482d9e3c2c6f autogen.sh --- a/autogen.sh Mon Jun 15 23:47:54 2009 +0200 +++ b/autogen.sh Mon Jun 29 22:30:04 2009 +0200 @@ -7,8 +7,8 @@ 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 \ - >>po/POTFILES.in || exit 1 + src/*.py src/common/*.py src/common/zeroconf/*.py src/osx/*.py | \ + grep -v ipython_view.py >>po/POTFILES.in || exit 1 intltoolize --force && \ aclocal -I ./m4 && \ diff -r 0d4b26c00c1c -r 482d9e3c2c6f configure.ac --- a/configure.ac Mon Jun 15 23:47:54 2009 +0200 +++ b/configure.ac Mon Jun 29 22:30:04 2009 +0200 @@ -33,7 +33,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.8.0 pygtk-2.0 >= 2.8.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/glade/gc_occupants_menu.glade --- a/data/glade/gc_occupants_menu.glade Mon Jun 15 23:47:54 2009 +0200 +++ b/data/glade/gc_occupants_menu.glade Mon Jun 29 22:30:04 2009 +0200 @@ -121,7 +121,35 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator6"> + <widget class="GtkImageMenuItem" id="block_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Block</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image5"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="unblock_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Unblock</property> + <property name="use_underline">True</property> + <child internal-child="image"> + <widget class="GtkImage" id="menu-item-image6"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon_size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator1"> <property name="visible">True</property> </widget> </child> diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/glade/roster_item_exchange_window.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/roster_item_exchange_window.glade Mon Jun 29 22:30:04 2009 +0200 @@ -0,0 +1,110 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkWindow" id="roster_item_exchange_window"> + <property name="title" translatable="yes">Roster Item Exchange</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">8</property> + <child> + <widget class="GtkLabel" id="type_label"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>someone(a)somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> + <property name="use_markup">True</property> + <property name="justify">center</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="padding">4</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="body_scrolledwindow"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkTextView" id="body_textview"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="editable">False</property> + <property name="justification">center</property> + <property name="cursor_visible">False</property> + <property name="text" translatable="yes">Message Body <currently unused, so it's hidden by default></property> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkTreeView" id="items_list_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + </widget> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="accept_button"> + <property name="label" translatable="yes">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_accept_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/away.png Binary file data/iconsets/transports/facebook/16x16/away.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/chat.png Binary file data/iconsets/transports/facebook/16x16/chat.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/dnd.png Binary file data/iconsets/transports/facebook/16x16/dnd.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/not_in_roster.png Binary file data/iconsets/transports/facebook/16x16/not_in_roster.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/offline.png Binary file data/iconsets/transports/facebook/16x16/offline.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/online.png Binary file data/iconsets/transports/facebook/16x16/online.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/16x16/xa.png Binary file data/iconsets/transports/facebook/16x16/xa.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/away.png Binary file data/iconsets/transports/facebook/32x32/away.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/chat.png Binary file data/iconsets/transports/facebook/32x32/chat.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/dnd.png Binary file data/iconsets/transports/facebook/32x32/dnd.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/not_in_roster.png Binary file data/iconsets/transports/facebook/32x32/not_in_roster.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/offline.png Binary file data/iconsets/transports/facebook/32x32/offline.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/online.png Binary file data/iconsets/transports/facebook/32x32/online.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/32x32/xa.png Binary file data/iconsets/transports/facebook/32x32/xa.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/48x48/offline.png Binary file data/iconsets/transports/facebook/48x48/offline.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/iconsets/transports/facebook/48x48/online.png Binary file data/iconsets/transports/facebook/48x48/online.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f data/pixmaps/agents/facebook.png Binary file data/pixmaps/agents/facebook.png has changed diff -r 0d4b26c00c1c -r 482d9e3c2c6f src/adhoc_commands.py --- a/src/adhoc_commands.py Mon Jun 15 23:47:54 2009 +0200 +++ b/src/adhoc_commands.py Mon Jun 29 22:30:04 2009 +0200 @@ -297,7 +297,9 @@ self.send_command(action) def stage3_next_form(self, command): - assert isinstance(command, xmpp.Node) + if not isinstance(command, xmpp.Node): + self.stage5(error=_('Service sent malformed data'), senderror=True) + return self.remove_pulsing() self.sending_form_progressbar.hide() @@ -307,6 +309,7 @@ elif self.sessionid != command.getAttr('sessionid'): self.stage5(error=_('Service changed the session identifier.'), senderror=True) + return self.form_status = command.getAttr('status') diff -r 0d4b26c00c1c -r 482d9e3c2c6f src/advanced.py --- a/src/advanced.py Mon Jun 15 23:47:54 2009 +0200 +++ b/src/advanced.py Mon Jun 29 22:30:04 2009 +0200 @@ -267,7 +267,7 @@ self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter): - search_string = self.entry.get_text().lower() + search_string = self.entry.get_text().decode('utf-8').lower() for it in tree_model_pre_order(model,treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it) diff -r 0d4b26c00c1c -r 482d9e3c2c6f src/chat_control.py --- a/src/chat_control.py Mon Jun 15 23:47:54 2009 +0200 +++ b/src/chat_control.py Mon Jun 29 22:30:04 2009 +0200 @@ -1781,8 +1781,7 @@ else: self.print_conversation(_('No help info for /%s') % command, 'info') - def send_message(self, message, keyID = '', chatstate = None, - xhtml = None): + def send_message(self, message, keyID='', chatstate=None, xhtml=None): '''Send a message to contact''' if message in ('', None, '\n') or self._process_command(message): return None

1 0

gajim: ignore <iq> without an ID. They are required by RFC. Fixe...
by Yann Leboulanger 29 Jun '09

29 Jun '09

changeset 49c34a7dae36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=49c34a7dae36 description: ignore <iq> without an ID. They are required by RFC. Fixes #5122 diffstat: src/common/connection_handlers.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 4be0d97473e1 -r 49c34a7dae36 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jun 29 06:31:36 2009 +0200 +++ b/src/common/connection_handlers.py Mon Jun 29 07:57:10 2009 +0200 @@ -867,6 +867,9 @@ gajim.transport_type[jid] = transport_type gajim.logger.save_transport_type(jid, transport_type) id_ = iq_obj.getID() + if id_ is None: + log.warn('Invalid IQ received without an ID. Ignoring it: %s' % iq_obj) + return if not identities: # ejabberd doesn't send identities when we browse online users #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 identities = [{'category': 'server', 'type': 'im', 'name': node}]

1 0

gajim: Fixed bug when national character (non-ASCII) was entered...
by vardo＠lagaule.org 29 Jun '09

29 Jun '09

changeset 4be0d97473e1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4be0d97473e1 description: Fixed bug when national character (non-ASCII) was entered which search string in ACE (comparison with descriptions, which are unicode, was not possible). It seems that this was Win32 specific (tested on Vista64). diffstat: src/advanced.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f04d5e7ebfb1 -r 4be0d97473e1 src/advanced.py --- a/src/advanced.py Sun Jun 28 16:01:43 2009 +0200 +++ b/src/advanced.py Mon Jun 29 06:31:36 2009 +0200 @@ -267,7 +267,7 @@ self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter): - search_string = self.entry.get_text().lower() + search_string = self.entry.get_text().decode('utf-8').lower() for it in tree_model_pre_order(model,treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it)

1 0

gajim: Fixed problem with multiple whiteboards and changed glade...
by Ummu 28 Jun '09

28 Jun '09

changeset a91c0ade3d9b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a91c0ade3d9b description: Fixed problem with multiple whiteboards and changed glade position numbers to fit in new button diffstat: data/glade/message_window.glade | 16 ++++++++-------- src/chat_control.py | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diffs (110 lines): diff -r 47338f8b413f -r a91c0ade3d9b data/glade/message_window.glade --- a/data/glade/message_window.glade Sun Jun 28 16:25:07 2009 +0200 +++ b/data/glade/message_window.glade Sun Jun 28 15:27:08 2009 -0700 @@ -353,7 +353,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -377,7 +377,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <child> @@ -401,7 +401,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">6</property> + <property name="position">7</property> </packing> </child> <child> @@ -425,7 +425,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">7</property> + <property name="position">8</property> </packing> </child> <child> @@ -436,7 +436,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">8</property> + <property name="position">9</property> </packing> </child> <child> @@ -460,7 +460,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">9</property> + <property name="position">10</property> </packing> </child> <child> @@ -472,7 +472,7 @@ </child> </widget> <packing> - <property name="position">10</property> + <property name="position">11</property> </packing> </child> <child> @@ -519,7 +519,7 @@ </widget> <packing> <property name="expand">False</property> - <property name="position">11</property> + <property name="position">12</property> </packing> </child> </widget> diff -r 47338f8b413f -r a91c0ade3d9b src/chat_control.py --- a/src/chat_control.py Sun Jun 28 16:25:07 2009 +0200 +++ b/src/chat_control.py Sun Jun 28 15:27:08 2009 -0700 @@ -294,8 +294,9 @@ # Hook up whiteboard button widget = self.xml.get_widget('start_whiteboard_button') - id_ = widget.connect('clicked', self._on_whiteboard_button_clicked) - self.handlers[id_] = widget + if widget is not None: + id_ = widget.connect('clicked', self._on_whiteboard_button_clicked) + self.handlers[id_] = widget def set_speller(self): try: @@ -2748,12 +2749,13 @@ self.print_conversation(')', 'status', simple=True) def _on_whiteboard_button_clicked(self, widget): - whiteboard = Whiteboard(gajim.connections[self.account]) hbox = self.xml.get_widget('chat_child_hbox') - try: - hbox.pack_start(whiteboard) - whiteboard.show() - except: - pass # TODO: Fix problem with groupchat? + if len(hbox.get_children()) == 1: + whiteboard = Whiteboard(gajim.connections[self.account]) + try: + hbox.pack_start(whiteboard) + whiteboard.show() + except: + pass # TODO: Fix problem with groupchat? # vim: se ts=3:

1 0

gajim: * clean roster tables when we remove an account
by Anaël Verrier 28 Jun '09

28 Jun '09

changeset 6771b91032cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6771b91032cd description: * clean roster tables when we remove an account diffstat: src/common/logger.py | 15 +++++++++++++-- src/config.py | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diffs (48 lines): diff -r b67198acb52f -r 6771b91032cd src/common/logger.py --- a/src/common/logger.py Sat Jun 27 20:54:49 2009 +0200 +++ b/src/common/logger.py Sun Jun 28 20:43:18 2009 +0200 @@ -858,7 +858,7 @@ jid_id = self.get_jid_id(jid) except exceptions.PysqliteOperationalError, e: raise exceptions.PysqliteOperationalError(str(e)) - sql = 'DELETE FROM roster_entry WHERE account_jid_id = %d AND jid_id = %d' % (account_jid_id, jid_id) + sql = 'DELETE FROM roster_entry WHERE account_jid_id=%d AND jid_id=%d' % (account_jid_id, jid_id) self.simple_commit(sql) def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups): @@ -875,7 +875,7 @@ # Update groups information # First we delete all previous groups information - sql = 'DELETE FROM roster_group WHERE account_jid_id = %d AND jid_id = %d' % (account_jid_id, jid_id) + sql = 'DELETE FROM roster_group WHERE account_jid_id=%d AND jid_id=%d' % (account_jid_id, jid_id) self.cur.execute(sql) # Then we add all new groups information for group in groups: @@ -923,4 +923,15 @@ return data + def remove_roster(self, account_jid): + account_jid_id = self.get_jid_id(account_jid) + + sql = 'DELETE FROM roster_group WHERE account_jid_id=%d' % ( + account_jid_id) + self.cur.execute(sql) + + sql = 'DELETE FROM roster_entry WHERE account_jid_id=%d' % ( + account_jid_id) + self.simple_commit(sql) + # vim: se ts=3: diff -r b67198acb52f -r 6771b91032cd src/config.py --- a/src/config.py Sat Jun 27 20:54:49 2009 +0200 +++ b/src/config.py Sun Jun 28 20:43:18 2009 +0200 @@ -2632,6 +2632,7 @@ gajim.interface.roster.close_all(self.account, force = True) gajim.connections[self.account].disconnect(on_purpose = True) del gajim.connections[self.account] + gajim.logger.remove_roster(gajim.get_jid_from_account(self.account)) gajim.config.del_per('accounts', self.account) gajim.interface.save_config() del gajim.interface.instances[self.account]

1 0

gajim: change icon of whieboard button
by Yann Leboulanger 28 Jun '09

28 Jun '09

changeset 47338f8b413f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47338f8b413f description: change icon of whieboard button diffstat: data/glade/message_window.glade | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a33567165405 -r 47338f8b413f data/glade/message_window.glade --- a/data/glade/message_window.glade Sun Jun 28 04:56:25 2009 -0700 +++ b/data/glade/message_window.glade Sun Jun 28 16:25:07 2009 +0200 @@ -346,7 +346,7 @@ <widget class="GtkImage" id="image12"> <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="stock">gtk-info</property> + <property name="stock">gtk-orientation-portrait</property> <property name="icon-size">2</property> </widget> </child>

1 0

gajim: add missing facebook icon
by Yann Leboulanger 28 Jun '09

28 Jun '09

changeset f04d5e7ebfb1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f04d5e7ebfb1 description: add missing facebook icon diffstat: data/pixmaps/agents/facebook.png | 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r e4071f6af12b -r f04d5e7ebfb1 data/pixmaps/agents/facebook.png Binary file data/pixmaps/agents/facebook.png has changed

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009