Commits April 2012

commits@gajim.org

3 participants
95 discussions

gajim: save opened chat controls when quitting and restore them ...
by Yann Leboulanger 20 Apr '12

20 Apr '12

changeset a0560814bf8b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a0560814bf8b description: save opened chat controls when quitting and restore them on startup. Fixes #3803 diffstat: src/common/config.py | 1 + src/message_window.py | 12 ++++++++++++ src/roster_window.py | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diffs (82 lines): diff -r 4f48e3267009 -r a0560814bf8b src/common/config.py --- a/src/common/config.py Thu Apr 19 16:57:43 2012 +0200 +++ b/src/common/config.py Fri Apr 20 14:34:24 2012 +0200 @@ -397,6 +397,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of jid for which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], diff -r 4f48e3267009 -r a0560814bf8b src/message_window.py --- a/src/message_window.py Thu Apr 19 16:57:43 2012 +0200 +++ b/src/message_window.py Fri Apr 20 14:34:24 2012 +0200 @@ -1244,3 +1244,15 @@ ctrl.type_id) ctrl.parent_win = mw mw.new_tab(ctrl) + + def save_opened_controls(self): + chat_controls = {} + for acct in gajim.connections: + chat_controls[acct] = [] + for ctrl in self.get_controls(type_=message_control.TYPE_CHAT): + acct = ctrl.account + if ctrl.contact.jid not in chat_controls[acct]: + chat_controls[acct].append(ctrl.contact.jid) + for acct in gajim.connections: + gajim.config.set_per('accounts', acct, 'opened_chat_controls', + ','.join(chat_controls[acct])) diff -r 4f48e3267009 -r a0560814bf8b src/roster_window.py --- a/src/roster_window.py Thu Apr 19 16:57:43 2012 +0200 +++ b/src/roster_window.py Fri Apr 20 14:34:24 2012 +0200 @@ -2381,6 +2381,8 @@ return True # do NOT destroy the window def prepare_quit(self): + if self.save_done: + return msgwin_width_adjust = 0 # in case show_roster_on_start is False and roster is never shown @@ -2403,6 +2405,7 @@ msgwin_width_adjust = -1 * width gajim.config.set('last_roster_visible', self.window.get_property('visible')) + gajim.interface.msg_win_mgr.save_opened_controls() gajim.interface.msg_win_mgr.shutdown(msgwin_width_adjust) gajim.config.set('collapsed_rows', '\t'.join(self.collapsed_rows)) @@ -2412,6 +2415,7 @@ self.close_all(account) if gajim.interface.systray_enabled: gajim.interface.hide_systray() + self.save_done = True def quit_gtkgui_interface(self): """ @@ -2573,6 +2577,14 @@ self.add_account_contacts(obj.conn.name) self.fire_up_unread_messages_events(obj.conn.name) else: + account = obj.conn.name + controls = gajim.config.get_per('accounts', account, + 'opened_chat_controls') + if controls: + for jid in controls.split(','): + contact = gajim.contacts.get_contact_with_highest_priority( + account, jid) + gajim.interface.on_open_chat_window(None, contact, account) gobject.idle_add(self.refilter_shown_roster_items) def _nec_anonymous_auth(self, obj): @@ -6296,6 +6308,8 @@ self.filtering = False # Number of renderers plugins added self.nb_ext_renderers = 0 + # When we quit, rememver if we already saved config once + self.save_done = False # [icon, name, type, jid, account, editable, mood_pixbuf, # activity_pixbuf, tune_pixbuf, location_pixbuf, avatar_pixbuf, # padlock_pixbuf]

1 0

gajim: catch SIGTERM so that on_exit func is executed at this ti...
by Yann Leboulanger 19 Apr '12

19 Apr '12

changeset 4f48e3267009 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f48e3267009 description: catch SIGTERM so that on_exit func is executed at this time too. diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 07d74574e511 -r 4f48e3267009 src/gajim.py --- a/src/gajim.py Thu Apr 19 14:01:42 2012 +0200 +++ b/src/gajim.py Thu Apr 19 16:57:43 2012 +0200 @@ -413,6 +413,7 @@ sys.exit(5) # ^C exits the application normally to delete pid file signal.signal(signal.SIGINT, sigint_cb) + signal.signal(signal.SIGTERM, sigint_cb) log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \ sys.getfilesystemencoding(), locale.getpreferredencoding())

1 0

gajim: improve Gajim startup
by Yann Leboulanger 19 Apr '12

19 Apr '12

changeset 07d74574e511 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=07d74574e511 description: improve Gajim startup diffstat: src/roster_window.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (25 lines): diff -r a30d26d3ff8a -r 07d74574e511 src/roster_window.py --- a/src/roster_window.py Thu Apr 19 14:01:28 2012 +0200 +++ b/src/roster_window.py Thu Apr 19 14:01:42 2012 +0200 @@ -1374,8 +1374,21 @@ self.tree.set_model(None) # disable sorting self.model.set_sort_column_id(-2, gtk.SORT_ASCENDING) + self.starting = True def _after_fill(self): + self.starting = False + for account in gajim.connections: + + jids = gajim.contacts.get_jid_list(account) + for jid in jids: + self.draw_completely(jid, account) + + # Draw all known groups + for group in gajim.groups[account]: + self.draw_group(group, account) + self.draw_account(account) + self.model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(self.modelfilter) self.tree.thaw_child_notify()

1 0

gajim: remove useless spaces
by Yann Leboulanger 19 Apr '12

19 Apr '12

changeset a30d26d3ff8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a30d26d3ff8a description: remove useless spaces diffstat: src/gui_interface.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (27 lines): diff -r 3fa83918c9f3 -r a30d26d3ff8a src/gui_interface.py --- a/src/gui_interface.py Thu Apr 19 14:00:54 2012 +0200 +++ b/src/gui_interface.py Thu Apr 19 14:01:28 2012 +0200 @@ -1164,20 +1164,20 @@ def handle_event_jingleft_cancel(self, obj): ft = self.instances['file_transfers'] file_props = None - + # get the file_props of our session for sid in obj.conn.files_props: fp = obj.conn.files_props[sid] if fp['session-sid'] == obj.sid: file_props = fp break - + ft.set_status(file_props['type'], file_props['sid'], 'stop') file_props['error'] = -4 # is it the right error code? ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' + 'the transfer') - + def handle_event_jingle_incoming(self, obj): # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, # data...))

1 0

gajim: move an import to prevent an import loop
by Yann Leboulanger 19 Apr '12

19 Apr '12

changeset 3fa83918c9f3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3fa83918c9f3 description: move an import to prevent an import loop diffstat: src/common/config.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 767f39dfd5e9 -r 3fa83918c9f3 src/common/config.py --- a/src/common/config.py Thu Apr 19 12:32:31 2012 +0200 +++ b/src/common/config.py Thu Apr 19 14:00:54 2012 +0200 @@ -38,8 +38,6 @@ import defs import gobject -from common import gajim - ( OPT_TYPE, OPT_VAL, @@ -785,6 +783,7 @@ self.__options[1][opt] = self.__options[0][opt][OPT_VAL] def _really_save(self): + from common import gajim if gajim.interface: gajim.interface.save_config() self.save_timeout_id = None

1 0

gajim: prevent a traceback
by Yann Leboulanger 19 Apr '12

19 Apr '12

changeset 767f39dfd5e9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=767f39dfd5e9 description: prevent a traceback diffstat: src/common/config.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 551f88f47cda -r 767f39dfd5e9 src/common/config.py --- a/src/common/config.py Wed Apr 18 14:00:16 2012 +0200 +++ b/src/common/config.py Thu Apr 19 12:32:31 2012 +0200 @@ -785,7 +785,8 @@ self.__options[1][opt] = self.__options[0][opt][OPT_VAL] def _really_save(self): - gajim.interface.save_config() + if gajim.interface: + gajim.interface.save_config() self.save_timeout_id = None return False

1 0

gajim: don't make preferences window too wide because of long au...
by Yann Leboulanger 18 Apr '12

18 Apr '12

changeset 551f88f47cda in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=551f88f47cda description: don't make preferences window too wide because of long audio / video strings diffstat: data/gui/preferences_window.ui | 18 +++++++++++++++++- src/config.py | 3 +++ 2 files changed, 20 insertions(+), 1 deletions(-) diffs (167 lines): diff -r f0f687193406 -r 551f88f47cda data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Wed Apr 18 11:34:57 2012 +0200 +++ b/data/gui/preferences_window.ui Wed Apr 18 14:00:16 2012 +0200 @@ -159,6 +159,7 @@ <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="preferences_notebook"> @@ -169,6 +170,7 @@ <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> @@ -186,6 +188,7 @@ <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> @@ -559,6 +562,7 @@ <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame29"> @@ -573,6 +577,7 @@ <child> <object class="GtkVBox" id="vbox67"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox1"> @@ -675,6 +680,7 @@ <child> <object class="GtkVBox" id="vbox_gmail"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="notify_gmail_checkbutton"> @@ -755,7 +761,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="position">1</property> </packing> </child> @@ -797,6 +802,7 @@ <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox4"> @@ -888,6 +894,7 @@ <object class="GtkVBox" id="vbox11"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame13"> @@ -1019,6 +1026,7 @@ <object class="GtkVBox" id="status_vbox"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame81"> @@ -1212,6 +1220,7 @@ <object class="GtkVBox" id="vbox2"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox2934"> @@ -1450,6 +1459,7 @@ <object class="GtkVBox" id="vbox58"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame9"> @@ -2072,6 +2082,7 @@ <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="audio_frame"> @@ -2219,6 +2230,7 @@ <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2230,6 +2242,7 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -2374,6 +2387,7 @@ <object class="GtkVBox" id="vbox45"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="applications_frame"> @@ -2388,6 +2402,7 @@ <child> <object class="GtkVBox" id="vbox50"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkComboBox" id="applications_combobox"> @@ -2716,6 +2731,7 @@ <child> <object class="GtkVBox" id="vbox66"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="log_show_changes_checkbutton"> diff -r f0f687193406 -r 551f88f47cda src/config.py --- a/src/config.py Wed Apr 18 11:34:57 2012 +0200 +++ b/src/config.py Wed Apr 18 14:00:16 2012 +0200 @@ -32,6 +32,7 @@ ## import gtk +import pango import gobject import os, sys import common.config @@ -443,6 +444,8 @@ key=None): combobox = self.xml.get_object(opt_name + '_combobox') cell = gtk.CellRendererText() + cell.set_property('ellipsize', pango.ELLIPSIZE_END) + cell.set_property('ellipsize-set', True) combobox.pack_start(cell, True) combobox.add_attribute(cell, 'text', 0) model = gtk.ListStore(str, str)

1 0

gajim: better handling of several phone numbers in vcard. Fixes ...
by Yann Leboulanger 18 Apr '12

18 Apr '12

changeset f0f687193406 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f0f687193406 description: better handling of several phone numbers in vcard. Fixes #5439 diffstat: src/profile_window.py | 6 +++++- src/vcard.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 55820f2d43fc -r f0f687193406 src/profile_window.py --- a/src/profile_window.py Wed Apr 18 10:36:39 2012 +0200 +++ b/src/profile_window.py Wed Apr 18 11:34:57 2012 +0200 @@ -234,7 +234,11 @@ def set_value(self, entry_name, value): try: - self.xml.get_object(entry_name).set_text(value) + widget = self.xml.get_object(entry_name) + val = widget.get_text() + if val: + value = val + ' / ' + value + widget.set_text(value) except AttributeError: pass diff -r 55820f2d43fc -r f0f687193406 src/vcard.py --- a/src/vcard.py Wed Apr 18 10:36:39 2012 +0200 +++ b/src/vcard.py Wed Apr 18 11:34:57 2012 +0200 @@ -198,7 +198,11 @@ table = self.xml.get_object('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0) else: - self.xml.get_object(entry_name).set_text(value) + widget = self.xml.get_object(entry_name) + val = widget.get_text() + if val: + value = val + ' / ' + value + widget.set_text(value) except AttributeError: pass

1 0

gajim: correctly select result row in history window. Fixes #3939
by Yann Leboulanger 18 Apr '12

18 Apr '12

changeset 55820f2d43fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55820f2d43fc description: correctly select result row in history window. Fixes #3939 diffstat: src/history_window.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 01f34e0578cd -r 55820f2d43fc src/history_window.py --- a/src/history_window.py Wed Apr 18 10:33:42 2012 +0200 +++ b/src/history_window.py Wed Apr 18 10:36:39 2012 +0200 @@ -602,7 +602,9 @@ """ start_iter = self.history_buffer.get_start_iter() local_time = time.localtime(float(unix_time)) - tim = time.strftime('%X', local_time) + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + tim = time.strftime(timestamp_str, local_time) result = start_iter.forward_search(tim, gtk.TEXT_SEARCH_VISIBLE_ONLY, None) if result is not None:

1 0

gajim: reset correctly timeout_id variable
by Yann Leboulanger 18 Apr '12

18 Apr '12

changeset 01f34e0578cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01f34e0578cd description: reset correctly timeout_id variable diffstat: src/common/config.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0b2601d11f2d -r 01f34e0578cd src/common/config.py --- a/src/common/config.py Wed Apr 18 10:15:53 2012 +0200 +++ b/src/common/config.py Wed Apr 18 10:33:42 2012 +0200 @@ -786,6 +786,7 @@ def _really_save(self): gajim.interface.save_config() + self.save_timeout_id = None return False def _timeout_save(self):

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2012