Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: initialize var before they are used
by Yann Leboulanger 25 Sep '09

25 Sep '09

changeset cbd3eacacb0c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cbd3eacacb0c description: initialize var before they are used diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (34 lines): diff -r 127c2d880408 -r cbd3eacacb0c src/chat_control.py --- a/src/chat_control.py Fri Sep 25 15:29:22 2009 +0200 +++ b/src/chat_control.py Fri Sep 25 15:47:43 2009 +0200 @@ -50,7 +50,7 @@ from common.pep import MOODS, ACTIVITIES from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO +from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO from commands.implementation import CommonCommands, ChatCommands @@ -1252,6 +1252,10 @@ self._audio_banner_image = self.xml.get_widget('audio_banner_image') self._video_banner_image = self.xml.get_widget('video_banner_image') + self.audio_sid = None + self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE + self.video_sid = None + self.video_state = self.JINGLE_STATE_NOT_AVAILABLE if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_AUDIO) and \ gajim.HAVE_FARSIGHT: self.set_audio_state('available') @@ -1262,10 +1266,6 @@ self.set_video_state('available') else: self.set_video_state('not_available') - self.audio_sid = None - self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE - self.video_sid = None - self.video_state = self.JINGLE_STATE_NOT_AVAILABLE self.update_toolbar()

1 0

gajim: fix some missing things in video GUI
by Yann Leboulanger 25 Sep '09

25 Sep '09

changeset 127c2d880408 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=127c2d880408 description: fix some missing things in video GUI diffstat: data/glade/message_window.glade | 12 +++++++++++- src/chat_control.py | 2 ++ 2 files changed, 13 insertions(+), 1 deletions(-) diffs (42 lines): diff -r 10a77be661e5 -r 127c2d880408 data/glade/message_window.glade --- a/data/glade/message_window.glade Fri Sep 25 13:52:44 2009 +0200 +++ b/data/glade/message_window.glade Fri Sep 25 15:29:22 2009 +0200 @@ -112,6 +112,16 @@ </packing> </child> <child> + <widget class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </widget> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> <widget class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> @@ -120,7 +130,7 @@ </child> </widget> <packing> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </widget> diff -r 10a77be661e5 -r 127c2d880408 src/chat_control.py --- a/src/chat_control.py Fri Sep 25 13:52:44 2009 +0200 +++ b/src/chat_control.py Fri Sep 25 15:29:22 2009 +0200 @@ -1263,7 +1263,9 @@ else: self.set_video_state('not_available') self.audio_sid = None + self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE self.video_sid = None + self.video_state = self.JINGLE_STATE_NOT_AVAILABLE self.update_toolbar()

1 0

gajim: new GUI to start audio and video sessions. TODO: ability ...
by Yann Leboulanger 25 Sep '09

25 Sep '09

changeset 10a77be661e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=10a77be661e5 description: new GUI to start audio and video sessions. TODO: ability to add/remove audio/video content to an existing session diffstat: data/glade/message_window.glade | 18 +-- src/chat_control.py | 167 ++++++++++++++++++++++++++++------------- src/common/jingle.py | 46 +++++++++-- 3 files changed, 157 insertions(+), 74 deletions(-) diffs (truncated from 347 to 300 lines): diff -r acd502e3545b -r 10a77be661e5 data/glade/message_window.glade --- a/data/glade/message_window.glade Tue Sep 22 22:33:00 2009 +0200 +++ b/data/glade/message_window.glade Fri Sep 25 13:52:44 2009 +0200 @@ -102,7 +102,7 @@ </packing> </child> <child> - <widget class="GtkImage" id="audio_image"> + <widget class="GtkImage" id="audio_banner_image"> <property name="visible">True</property> <property name="stock">None</property> <property name="icon-size">1</property> @@ -333,15 +333,13 @@ </packing> </child> <child> - <widget class="GtkButton" id="start_audio_button"> + <widget class="GtkToggleButton" id="audio_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Start audio session</property> + <property name="tooltip" translatable="yes">Toggle audio session</property> <property name="relief">none</property> - <signal name="activate" handler="on_start_audio_button_activate"/> <child> - <widget class="GtkImage" id="start_audio_image"> + <widget class="GtkImage" id="audio_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -354,15 +352,13 @@ </packing> </child> <child> - <widget class="GtkButton" id="stop_audio_button"> + <widget class="GtkToggleButton" id="video_togglebutton"> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip" translatable="yes">Stop audio session</property> + <property name="tooltip" translatable="yes">Toggle video session</property> <property name="relief">none</property> - <signal name="activate" handler="on_stop_audio_button_activate"/> <child> - <widget class="GtkImage" id="stop_audio_image"> + <widget class="GtkImage" id="video_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> diff -r acd502e3545b -r 10a77be661e5 src/chat_control.py --- a/src/chat_control.py Tue Sep 22 22:33:00 2009 +0200 +++ b/src/chat_control.py Fri Sep 25 13:52:44 2009 +0200 @@ -1167,12 +1167,12 @@ class ChatControl(ChatControlBase, ChatCommands): '''A control for standard 1-1 chat''' ( - AUDIO_STATE_NOT_AVAILABLE, - AUDIO_STATE_AVAILABLE, - AUDIO_STATE_CONNECTING, - AUDIO_STATE_CONNECTION_RECEIVED, - AUDIO_STATE_CONNECTED, - AUDIO_STATE_ERROR + JINGLE_STATE_NOT_AVAILABLE, + JINGLE_STATE_AVAILABLE, + JINGLE_STATE_CONNECTING, + JINGLE_STATE_CONNECTION_RECEIVED, + JINGLE_STATE_CONNECTED, + JINGLE_STATE_ERROR ) = range(6) TYPE_ID = message_control.TYPE_CHAT @@ -1200,15 +1200,13 @@ self._on_add_to_roster_menuitem_activate) self.handlers[id_] = self._add_to_roster_button - self._start_audio_button = self.xml.get_widget('start_audio_button') - id_ = self._start_audio_button.connect('clicked', - self.on_start_audio_button_activate) - self.handlers[id_] = self._start_audio_button + self._audio_button = self.xml.get_widget('audio_togglebutton') + id_ = self._audio_button.connect('toggled', self.on_audio_button_toggled) + self.handlers[id_] = self._audio_button - self._stop_audio_button = self.xml.get_widget('stop_audio_button') - id_ = self._stop_audio_button.connect('clicked', - self.on_stop_audio_button_activate) - self.handlers[id_] = self._stop_audio_button + self._video_button = self.xml.get_widget('video_togglebutton') + id_ = self._video_button.connect('toggled', self.on_video_button_toggled) + self.handlers[id_] = self._video_button self._send_file_button = self.xml.get_widget('send_file_button') # add a special img for send file button @@ -1252,13 +1250,20 @@ img.set_from_pixbuf(gtkgui_helpers.load_icon( 'muc_active').get_pixbuf()) - self._audio_image = self.xml.get_widget('audio_image') + self._audio_banner_image = self.xml.get_widget('audio_banner_image') + self._video_banner_image = self.xml.get_widget('video_banner_image') if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_AUDIO) and \ gajim.HAVE_FARSIGHT: self.set_audio_state('available') else: self.set_audio_state('not_available') + if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_VIDEO) and \ + gajim.HAVE_FARSIGHT: + self.set_video_state('available') + else: + self.set_video_state('not_available') self.audio_sid = None + self.video_sid = None self.update_toolbar() @@ -1369,18 +1374,16 @@ self._add_to_roster_button.hide() # Audio buttons - if self.audio_state == self.AUDIO_STATE_NOT_AVAILABLE: - self._start_audio_button.show() - self._start_audio_button.set_sensitive(False) - self._stop_audio_button.hide() - elif self.audio_state in (self.AUDIO_STATE_AVAILABLE, - self.AUDIO_STATE_ERROR): - self._start_audio_button.show() - self._start_audio_button.set_sensitive(True) - self._stop_audio_button.hide() + if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: + self._audio_button.set_sensitive(False) else: - self._start_audio_button.hide() - self._stop_audio_button.show() + self._audio_button.set_sensitive(True) + + # Video buttons + if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE: + self._video_button.set_sensitive(False) + else: + self._video_button.set_sensitive(True) # Send file if gajim.capscache.is_supported(self.contact, NS_FILE) and \ @@ -1515,19 +1518,35 @@ self._tune_image.hide() def update_audio(self): - if self.audio_state in (self.AUDIO_STATE_NOT_AVAILABLE, - self.AUDIO_STATE_AVAILABLE): - self._audio_image.hide() + if self.audio_state in (self.JINGLE_STATE_NOT_AVAILABLE, + self.JINGLE_STATE_AVAILABLE): + self._audio_banner_image.hide() else: - self._audio_image.show() - if self.audio_state == self.AUDIO_STATE_CONNECTING: - self._audio_image.set_from_stock(gtk.STOCK_CONVERT, 1) - elif self.audio_state == self.AUDIO_STATE_CONNECTION_RECEIVED: - self._audio_image.set_from_stock(gtk.STOCK_NETWORK, 1) - elif self.audio_state == self.AUDIO_STATE_CONNECTED: - self._audio_image.set_from_stock(gtk.STOCK_CONNECT, 1) - elif self.audio_state == self.AUDIO_STATE_ERROR: - self._audio_image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 1) + self._audio_banner_image.show() + if self.audio_state == self.JINGLE_STATE_CONNECTING: + self._audio_banner_image.set_from_stock(gtk.STOCK_CONVERT, 1) + elif self.audio_state == self.JINGLE_STATE_CONNECTION_RECEIVED: + self._audio_banner_image.set_from_stock(gtk.STOCK_NETWORK, 1) + elif self.audio_state == self.JINGLE_STATE_CONNECTED: + self._audio_banner_image.set_from_stock(gtk.STOCK_CONNECT, 1) + elif self.audio_state == self.JINGLE_STATE_ERROR: + self._audio_banner_image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 1) + self.update_toolbar() + + def update_video(self): + if self.video_state in (self.JINGLE_STATE_NOT_AVAILABLE, + self.JINGLE_STATE_AVAILABLE): + self._video_banner_image.hide() + else: + self._video_banner_image.show() + if self.video_state == self.JINGLE_STATE_CONNECTING: + self._video_banner_image.set_from_stock(gtk.STOCK_CONVERT, 1) + elif self.video_state == self.JINGLE_STATE_CONNECTION_RECEIVED: + self._video_banner_image.set_from_stock(gtk.STOCK_NETWORK, 1) + elif self.video_state == self.JINGLE_STATE_CONNECTED: + self._video_banner_image.set_from_stock(gtk.STOCK_CONNECT, 1) + elif self.video_state == self.JINGLE_STATE_ERROR: + self._video_banner_image.set_from_stock(gtk.STOCK_DIALOG_WARNING, 1) self.update_toolbar() def change_resource(self, resource): @@ -1550,26 +1569,53 @@ str += ', ' + _('reason: %s') % reason self.print_conversation(str, 'info') if state == 'not_available': - self.audio_state = self.AUDIO_STATE_NOT_AVAILABLE + self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE self.audio_sid = None elif state == 'available': - self.audio_state = self.AUDIO_STATE_AVAILABLE + self.audio_state = self.JINGLE_STATE_AVAILABLE self.audio_sid = None elif state == 'connecting': - self.audio_state = self.AUDIO_STATE_CONNECTING + self.audio_state = self.JINGLE_STATE_CONNECTING self.audio_sid = sid elif state == 'connection_received': - self.audio_state = self.AUDIO_STATE_CONNECTION_RECEIVED + self.audio_state = self.JINGLE_STATE_CONNECTION_RECEIVED self.audio_sid = sid elif state == 'connected': - self.audio_state = self.AUDIO_STATE_CONNECTED + self.audio_state = self.JINGLE_STATE_CONNECTED elif state == 'stop': - self.audio_state = self.AUDIO_STATE_AVAILABLE + self.audio_state = self.JINGLE_STATE_AVAILABLE self.audio_sid = None elif state == 'error': - self.audio_state = self.AUDIO_STATE_ERROR + self.audio_state = self.JINGLE_STATE_ERROR self.update_audio() + def set_video_state(self, state, sid=None, reason=None): + if state in ('connecting', 'connected', 'stop'): + str = _('Video state : %s') % state + if reason: + str += ', ' + _('reason: %s') % reason + self.print_conversation(str, 'info') + if state == 'not_available': + self.video_state = self.JINGLE_STATE_NOT_AVAILABLE + self.video_sid = None + elif state == 'available': + self.video_state = self.JINGLE_STATE_AVAILABLE + self.video_sid = None + elif state == 'connecting': + self.video_state = self.JINGLE_STATE_CONNECTING + self.video_sid = sid + elif state == 'connection_received': + self.video_state = self.JINGLE_STATE_CONNECTION_RECEIVED + self.video_sid = sid + elif state == 'connected': + self.video_state = self.JINGLE_STATE_CONNECTED + elif state == 'stop': + self.video_state = self.JINGLE_STATE_AVAILABLE + self.video_sid = None + elif state == 'error': + self.video_state = self.JINGLE_STATE_ERROR + self.update_video() + def on_avatar_eventbox_enter_notify_event(self, widget, event): ''' we enter the eventbox area so we under conditions add a timeout @@ -1770,16 +1816,29 @@ banner_name_label.set_markup(label_text) banner_name_tooltip.set_tip(banner_name_label, label_tooltip) - def on_start_audio_button_activate(self, *things): - sid = gajim.connections[self.account].startVoIP(self.contact.get_full_jid( - )) - self.set_audio_state('connecting', sid) + def on_audio_button_toggled(self, widget): + if widget.get_active(): + sid = gajim.connections[self.account].startVoIP( + self.contact.get_full_jid()) + self.set_audio_state('connecting', sid) + else: + session = gajim.connections[self.account].get_jingle_session( + self.contact.get_full_jid(), self.audio_sid) + if session: + # TODO: end only audio + session.end_session() - def on_stop_audio_button_activate(self, *things): - session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.audio_sid) - if session: - session.end_session() + def on_video_button_toggled(self, widget): + if widget.get_active(): + sid = gajim.connections[self.account].startVideoIP( + self.contact.get_full_jid()) + self.set_video_state('connecting', sid) + else: + session = gajim.connections[self.account].get_jingle_session( + self.contact.get_full_jid(), self.video_sid) + if session: + # TODO: end only video + session.end_session() def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: diff -r acd502e3545b -r 10a77be661e5 src/common/jingle.py --- a/src/common/jingle.py Tue Sep 22 22:33:00 2009 +0200 +++ b/src/common/jingle.py Fri Sep 25 13:52:44 2009 +0200 @@ -953,14 +953,42 @@ raise xmpp.NodeProcessed def startVoIP(self, jid): - jingle = JingleSession(self, weinitiate=True, jid=jid)

1 0

gajim: [Djavan Fagundes] updated brazilian translation
by Yann Leboulanger 24 Sep '09

24 Sep '09

changeset f69ddcfb9bcb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f69ddcfb9bcb description: [Djavan Fagundes] updated brazilian translation diffstat: po/pt_BR.po | 2663 ++++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 1338 insertions(+), 1325 deletions(-) diffs (truncated from 6514 to 300 lines): diff -r 602caa481723 -r f69ddcfb9bcb po/pt_BR.po --- a/po/pt_BR.po Thu Sep 24 01:28:35 2009 +0300 +++ b/po/pt_BR.po Thu Sep 24 11:26:46 2009 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-19 20:36+0200\n" -"PO-Revision-Date: 2009-08-20 00:00+0200\n" +"POT-Creation-Date: 2009-09-24 09:09+0200\n" +"PO-Revision-Date: 2009-09-23 09:56-0300\n" "Last-Translator: Djavan Fagundes <dnoway(a)gmail.com>\n" "Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" "MIME-Version: 1.0\n" @@ -99,7 +99,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "@" -msgstr "" +msgstr "@" #: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "" @@ -112,11 +112,11 @@ #: ../data/glade/account_creation_wizard_window.glade.h:11 #, fuzzy msgid "Anon_ymous authentication" -msgstr "Usar autenticação" +msgstr "Usar aut_enticação de proxy" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" -msgstr "Conectar quando eu clicar em Fim" +msgstr "Conectar quando eu clicar em Concluir" #: ../data/glade/account_creation_wizard_window.glade.h:13 msgid "Gajim: Account Creation Wizard" @@ -219,6 +219,7 @@ #: ../data/glade/account_modification_window.glade.h:4 #: ../data/glade/accounts_window.glade.h:6 +#: ../data/glade/join_groupchat_window.glade.h:1 msgid "Account" msgstr "Conta" @@ -286,8 +287,8 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212 -#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217 +#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568 #: ../src/notify.py:607 ../src/notify.py:619 msgid "Gajim" msgstr "Gajim" @@ -298,8 +299,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719 -#: ../src/roster_window.py:5277 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2686 +#: ../src/roster_window.py:5270 msgid "General" msgstr "Geral" @@ -324,7 +325,7 @@ "which results in disconnection" msgstr "" "Se marcado, o Gajim enviará pacotes keep-alive para prevenir timeout na " -"conexão, fazendo-a cair" +"conexão, evitando-a cair" #: ../data/glade/account_modification_window.glade.h:22 msgid "" @@ -359,25 +360,21 @@ msgstr "Informações sobre você são gravadas no servidor" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547 -#: ../src/config.py:2092 +#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1578 +#: ../src/config.py:2122 msgid "No key selected" msgstr "Nenhuma chave selecionada" #. None means no proxy profile selected -#. boshuseproxy_checkbutton.set_active(False) -#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) -#. useauth_checkbutton.set_active(False) -#. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103 -#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457 -#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091 -#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1104 +#: ../src/config.py:1207 ../src/config.py:1483 ../src/config.py:1488 +#: ../src/config.py:2029 ../src/config.py:2108 ../src/config.py:2121 +#: ../src/config.py:3257 ../src/config.py:3330 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 -#: ../src/roster_window.py:2789 ../src/roster_window.py:2795 -#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:2756 ../src/roster_window.py:2762 +#: ../src/roster_window.py:2767 msgid "None" msgstr "Nenhum" @@ -483,9 +480,8 @@ msgstr "Proxy" #: ../data/glade/accounts_window.glade.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "_Ajustar para status" +msgstr "Aj_ustar para status" #: ../data/glade/accounts_window.glade.h:7 msgid "Accounts" @@ -494,7 +490,7 @@ #: ../data/glade/accounts_window.glade.h:9 #, fuzzy msgid "Anonymous authentication" -msgstr "Usar autenticação" +msgstr "Usar aut_enticação de proxy" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -505,9 +501,8 @@ "através de uma conexão não-segura." #: ../data/glade/accounts_window.glade.h:17 -#, fuzzy msgid "Co_nnect on Gajim startup" -msgstr "C_onectar na inicialização do Gajim" +msgstr "Co_nectar na inicialização do Gajim" #: ../data/glade/accounts_window.glade.h:19 #: ../data/glade/zeroconf_information_window.glade.h:2 @@ -534,7 +529,7 @@ "Considere a possível modificação das regras do seu firewall." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1602 #: ../src/dialogs.py:784 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -549,57 +544,47 @@ msgstr "Mes_clar contas" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5221 msgid "Re_name" msgstr "Re_nomear" #: ../data/glade/accounts_window.glade.h:47 -#, fuzzy msgid "Send _keep-alive packets" msgstr "Enviar pacotes para manter a conexão (keep-alive)" #: ../data/glade/accounts_window.glade.h:49 -#, fuzzy msgid "Synchroni_ze account status with global status" -msgstr "_Sincronizar status da conta com status global" +msgstr "Sincroni_zar status da conta com status global" #: ../data/glade/accounts_window.glade.h:51 -#, fuzzy msgid "Use G_PG Agent" -msgstr "Usar o _Agente GPG" +msgstr "Usar o Agente G_PG" #: ../data/glade/accounts_window.glade.h:52 -#, fuzzy msgid "Use cust_om hostname/port" -msgstr "Usa nome de máquina/porta customizados" +msgstr "Usa nome de máquina/porta personalizad_os" #: ../data/glade/accounts_window.glade.h:53 -#, fuzzy msgid "Use cust_om port:" -msgstr "Usar servidor/porta personalizado" +msgstr "Usar porta pers_onalizada:" #: ../data/glade/accounts_window.glade.h:55 -#, fuzzy msgid "_Edit Personal Information..." -msgstr "Editar detalhes pessoais..." +msgstr "_Editar detalhes pessoais..." #: ../data/glade/accounts_window.glade.h:56 -#, fuzzy msgid "_Enable" -msgstr "Habilitar" +msgstr "Ha_bilitar" #: ../data/glade/accounts_window.glade.h:57 -#, fuzzy msgid "_Hostname: " msgstr "_Nome do computador:" #: ../data/glade/accounts_window.glade.h:59 -#, fuzzy msgid "_Manage..." -msgstr "Gerenciar..." +msgstr "Gere_nciar..." #: ../data/glade/accounts_window.glade.h:61 -#, fuzzy msgid "_Port: " msgstr "_Porta:" @@ -608,9 +593,8 @@ msgstr "A_visar antes de usar uma conexão não-segura" #: ../data/glade/accounts_window.glade.h:63 -#, fuzzy msgid "_use HTTP__PROXY environment variable" -msgstr "Usar variável de ambiente HTTP_PROXY" +msgstr "_usar variável de ambiente HTTP__PROXY" #: ../data/glade/accounts_window.glade.h:64 msgid "gtk-add" @@ -649,7 +633,7 @@ "protocol. Click on register button to\n" "proceed." msgstr "" -"Você deve estar registrado a este \n" +"Você deve estar registrado para este \n" "transporte para poder adicionar \n" "contatos deste protocolo. Clique no \n" "botão Registrar para aceitar." @@ -812,7 +796,7 @@ msgstr "Totos os status" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:214 +#: ../src/common/commands.py:101 ../src/common/helpers.py:219 msgid "Away" msgstr "Afastado" @@ -829,7 +813,7 @@ msgstr "Possui " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:224 +#: ../src/common/helpers.py:229 msgid "Invisible" msgstr "Invisível" @@ -838,7 +822,7 @@ msgstr "Executar um comando" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:197 +#: ../src/common/helpers.py:202 msgid "Not Available" msgstr "Não disponível" @@ -1056,7 +1040,6 @@ #: ../data/glade/chat_control_popup_menu.glade.h:2 #: ../data/glade/gc_occupants_menu.glade.h:3 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:4 msgid "Send _File" msgstr "Enviar _arquivo" @@ -1077,9 +1060,7 @@ #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 #: ../data/glade/roster_contact_context_menu.glade.h:17 -#: ../data/glade/roster_window.glade.h:21 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5924 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5928 msgid "_History" msgstr "_Histórico" @@ -1212,7 +1193,7 @@ #: ../data/glade/gajim_themes_window.glade.h:1 msgid "Chatstate Tab Colors" -msgstr "Aba cores do bate-papo" +msgstr "Aba de cores do bate-papo" #: ../data/glade/gajim_themes_window.glade.h:2 msgid "" @@ -1226,13 +1207,13 @@ "Linha contato\n" "Banner de conversa" -#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770 +#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:810 msgid "Bold" msgstr "Negrito"

1 0

gajim: Keep the code consistent
by red-agent 23 Sep '09

23 Sep '09

changeset 602caa481723 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=602caa481723 description: Keep the code consistent diffstat: src/commands/implementation.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r bb367bab3ecb -r 602caa481723 src/commands/implementation.py --- a/src/commands/implementation.py Wed Sep 23 22:27:52 2009 +0200 +++ b/src/commands/implementation.py Thu Sep 24 01:28:35 2009 +0300 @@ -192,8 +192,7 @@ gajim.interface.instances[self.account]['join_gc'].window.present() except KeyError: try: - dialogs.JoinGroupchatWindow(account=self.account, room_jid=jid, - nick=nick) + dialogs.JoinGroupchatWindow(account=self.account, room_jid=jid, nick=nick) except GajimGeneralException: pass

1 0

gajim: don't remove a file before renaming under windows because...
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset bb367bab3ecb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bb367bab3ecb description: don't remove a file before renaming under windows because os.remove('test') will remove 'TEST' under window. Fixes #5279 diffstat: src/common/helpers.py | 5 +++++ src/groupchat_control.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (31 lines): diff -r 8116020da28c -r bb367bab3ecb src/common/helpers.py --- a/src/common/helpers.py Wed Sep 23 21:35:27 2009 +0200 +++ b/src/common/helpers.py Wed Sep 23 22:27:52 2009 +0200 @@ -170,6 +170,11 @@ else: return server +def windowsify(s): + if os.name == 'nt': + return s.capitalize() + return s + def temp_failure_retry(func, *args, **kwargs): while True: try: diff -r 8116020da28c -r bb367bab3ecb src/groupchat_control.py --- a/src/groupchat_control.py Wed Sep 23 21:35:27 2009 +0200 +++ b/src/groupchat_control.py Wed Sep 23 22:27:52 2009 +0200 @@ -1271,8 +1271,10 @@ os.path.join(path, puny_new_nick + ext) for old_file in files: if os.path.exists(old_file) and old_file != files[old_file]: - if os.path.exists(files[old_file]): - # Windows require this + if os.path.exists(files[old_file]) and helpers.windowsify( + old_file) != helpers.windowsify(files[old_file]): + # Windows require this, but os.remove('test') will also + # remove 'TEST' os.remove(files[old_file]) os.rename(old_file, files[old_file]) self.print_conversation(s, 'info', tim)

1 0

gajim: fix /join command to use the same account as the one we'r...
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset 8116020da28c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8116020da28c description: fix /join command to use the same account as the one we're connected in the current room. diffstat: src/commands/implementation.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 0dd83e60feab -r 8116020da28c src/commands/implementation.py --- a/src/commands/implementation.py Wed Sep 23 19:07:58 2009 +0200 +++ b/src/commands/implementation.py Wed Sep 23 21:35:27 2009 +0200 @@ -192,7 +192,8 @@ gajim.interface.instances[self.account]['join_gc'].window.present() except KeyError: try: - dialogs.JoinGroupchatWindow(account=None, room_jid=jid, nick=nick) + dialogs.JoinGroupchatWindow(account=self.account, room_jid=jid, + nick=nick) except GajimGeneralException: pass

1 0

gajim: fix traceback preventing showing ALT text of an image. Fi...
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset 0dd83e60feab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0dd83e60feab description: fix traceback preventing showing ALT text of an image. Fixes #5247 diffstat: src/htmltextview.py | 67 ++++++++++++++++----------------- 1 files changed, 33 insertions(+), 34 deletions(-) diffs (84 lines): diff -r 0fbb4c8729fe -r 0dd83e60feab src/htmltextview.py --- a/src/htmltextview.py Wed Sep 23 19:04:12 2009 +0200 +++ b/src/htmltextview.py Wed Sep 23 19:07:58 2009 +0200 @@ -483,6 +483,7 @@ def _process_img(self, attrs): '''Process a img tag. ''' + mem = '' try: # Wait maximum 1s for connection socket.setdefaulttimeout(1) @@ -498,40 +499,38 @@ f.fp._sock.fp._sock.settimeout(0.5) except Exception: pass - # Max image size = 2 MB (to try to prevent DoS) - mem = '' - deadline = time.time() + 3 - while True: - if time.time() > deadline: - gajim.log.debug(str('Timeout loading image %s ' % \ - attrs['src'] + ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - try: - temp = f.read(100) - except socket.timeout, ex: - gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ - str(ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - if temp: - mem += temp - else: - break - if len(mem) > 2*1024*1024: - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Image is too big') - break + # Max image size = 2 MB (to try to prevent DoS) + deadline = time.time() + 3 + while True: + if time.time() > deadline: + gajim.log.debug(str('Timeout loading image %s ' % \ + attrs['src'] + ex)) + mem = '' + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + try: + temp = f.read(100) + except socket.timeout, ex: + gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ + str(ex)) + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + if temp: + mem += temp + else: + break + if len(mem) > 2*1024*1024: + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Image is too big') + break pixbuf = None if mem: # Caveat: GdkPixbuf is known not to be safe to load

1 0

gajim: process links and latex in HTML messages. Fixes #5053, #4539
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset 0fbb4c8729fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0fbb4c8729fe description: process links and latex in HTML messages. Fixes #5053, #4539 diffstat: src/conversation_textview.py | 25 +++++--- src/htmltextview.py | 139 ++++++++++++++-------------------------------- 2 files changed, 58 insertions(+), 106 deletions(-) diffs (truncated from 345 to 300 lines): diff -r 6d21fdb509fa -r 0fbb4c8729fe src/conversation_textview.py --- a/src/conversation_textview.py Wed Sep 23 18:54:35 2009 +0200 +++ b/src/conversation_textview.py Wed Sep 23 19:04:12 2009 +0200 @@ -954,6 +954,13 @@ print_conversation_line()''' buffer_ = self.tv.get_buffer() + + insert_tags_func = buffer_.insert_with_tags_by_name + # detect_and_print_special_text() is also used by + # HtmlHandler.handle_specials() and there tags is gtk.TextTag objects, + # not strings + if len(other_tags) > 0 and isinstance(other_tags[0], gtk.TextTag): + insert_tags_func = buffer_.insert_with_tags index = 0 @@ -974,8 +981,7 @@ text_before_special_text = otext[index:start] end_iter = buffer_.get_end_iter() # we insert normal text - buffer_.insert_with_tags_by_name(end_iter, - text_before_special_text, *other_tags) + insert_tags_func(end_iter, text_before_special_text, *other_tags) index = end # update index # now print it @@ -984,7 +990,11 @@ if specials_limit <= 0: break - return index # the position after *last* special text + # add the rest of text located in the index and after + end_iter = buffer_.get_end_iter() + insert_tags_func(end_iter, otext[index:], *other_tags) + + return buffer_.get_end_iter() def print_special_text(self, special_text, other_tags): '''is called by detect_and_print_special_text and prints @@ -1280,22 +1290,17 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8')) + self.tv.display_html(xhtml.encode('utf-8'), self) return except Exception, e: gajim.log.debug(str('Error processing xhtml') + str(e)) gajim.log.debug(str('with |' + xhtml + '|')) - buffer_ = self.tv.get_buffer() # /me is replaced by name if name is given if name and (text.startswith('/me ') or text.startswith('/me\n')): text = '* ' + name + text[3:] text_tags.append('italic') # detect urls formatting and if the user has it on emoticons - index = self.detect_and_print_special_text(text, text_tags) - - # add the rest of text located in the index and after - end_iter = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(end_iter, text[index:], *text_tags) + self.detect_and_print_special_text(text, text_tags) # vim: se ts=3: diff -r 6d21fdb509fa -r 0fbb4c8729fe src/htmltextview.py --- a/src/htmltextview.py Wed Sep 23 18:54:35 2009 +0200 +++ b/src/htmltextview.py Wed Sep 23 19:04:12 2009 +0200 @@ -50,6 +50,8 @@ if __name__ == '__main__': from common import i18n + import common.configpaths + common.configpaths.gajimpaths.init(None) from common import gajim import tooltips @@ -184,25 +186,6 @@ ('font-weight: bold', 'font-style: oblique')[weigth], ) - -def build_patterns(view, config, interface): - # extra, rst does not mark _underline_ or /it/ up - # actually , or are not in the JEP-0071, but are seen in the wild - basic_pattern = r'(?<!\w|\<|/|:)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w|/|:)|'\ - r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' - view.basic_pattern_re = re.compile(basic_pattern) - # emoticons - emoticons_pattern = '' - if config.get('emoticons_theme'): - emoticons_pattern = gajim.interface.emot_only - - view.emot_pattern_re = re.compile(emoticons_pattern, re.IGNORECASE) - # because emoticons match later (in the string) they need to be after - # basic matches that may occur earlier - emot_and_basic_pattern = basic_pattern + emoticons_pattern - view.emot_and_basic_re = re.compile(emot_and_basic_pattern, re.IGNORECASE) - - def _parse_css_color(color): '''_parse_css_color(css_color) -> gtk.gdk.Color''' if color.startswith('rgb(') and color.endswith(')'): @@ -222,11 +205,12 @@ It keeps a stack of "style spans" (start/end element pairs) and a stack of list counters, for nested lists. """ - def __init__(self, textview, startiter): + def __init__(self, conv_textview, startiter): xml.sax.handler.ContentHandler.__init__(self) - self.textbuf = textview.get_buffer() - self.textview = textview + self.textbuf = conv_textview.tv.get_buffer() + self.textview = conv_textview.tv self.iter = startiter + self.conv_textview = conv_textview self.text = '' self.starting=True self.preserve = False @@ -672,51 +656,7 @@ return False def handle_specials(self, text): - index = 0 - se = self.textview.config.get('show_ascii_formatting_chars') - af = gajim.config.get('ascii_formatting') - if self.textview.config.get('emoticons_theme'): - if af: - iterator = self.textview.emot_and_basic_re.finditer(text) - else: - iterator = self.textview.emot_pattern_re.finditer(text) - elif af: - iterator = self.textview.basic_pattern_re.finditer(text) - else: - iterator = [] - for match in iterator: - start, end = match.span() - special_text = text[start:end] - if start != 0: - self._insert_text(text[index:start]) - index = end # update index - #emoticons - possible_emot_ascii_caps = special_text.upper() # emoticons keys are CAPS - if self.textview.config.get('emoticons_theme') and \ - possible_emot_ascii_caps in self.textview.interface.emoticons.keys(): - #it's an emoticon - emot_ascii = possible_emot_ascii_caps - anchor = self.textbuf.create_child_anchor(self.iter) - img = gtk.Image() - img.set_from_file(self.textview.interface.emoticons[emot_ascii]) - img.show() - # TODO: add alt/tooltip with the special_text (a11y) - self.textview.add_child_at_anchor(img, anchor) - elif af: - # now print it - if special_text.startswith('/'): # it's explicit italics - self.startElement('i', {}) - elif special_text.startswith('_'): # it's explicit underline - self.startElement('u', {}) - if se: self._insert_text(special_text[0]) - self.handle_specials(special_text[1:-1]) - if se: self._insert_text(special_text[0]) - if special_text.startswith('_'): # it's explicit underline - self.endElement('u') - if special_text.startswith('/'): # it's explicit italics - self.endElement('i') - if index < len(text): - self._insert_text(text[index:]) + self.iter = self.conv_textview.detect_and_print_special_text(text, self._get_style_tags()) def characters(self, content): if self.preserve: @@ -870,7 +810,6 @@ self.config = gajim.config self.interface = gajim.interface # end big hack - build_patterns(self,gajim.config,gajim.interface) def __destroy_event(self, widget): if self.tooltip.timeout != 0: @@ -921,14 +860,14 @@ self._changed_cursor = False return False - def display_html(self, html): + def display_html(self, html, conv_textview): buffer_ = self.get_buffer() eob = buffer_.get_end_iter() ## this works too if libxml2 is not available # parser = xml.sax.make_parser(['drv_libxml2']) # parser.setFeature(xml.sax.handler.feature_validation, True) parser = xml.sax.make_parser() - parser.setContentHandler(HtmlHandler(self, eob)) + parser.setContentHandler(HtmlHandler(conv_textview, eob)) parser.parse(StringIO(html)) # too much space after :) @@ -942,6 +881,9 @@ if __name__ == '__main__': import os + from conversation_textview import ConversationTextview + import gajim as gaj + class log(object): def debug(self, text): @@ -953,33 +895,32 @@ gajim.log=log() - if gajim.config.get('emoticons_theme'): - print "emoticons" + gaj.Interface() - htmlview = HtmlTextView() + htmlview = ConversationTextview(None) path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') # use this for hr - htmlview.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) + htmlview.tv.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) tooltip = tooltips.BaseTooltip() def on_textview_motion_notify_event(widget, event): '''change the cursor to a hand when we are over a mail or an url''' global change_cursor - pointer_x, pointer_y = htmlview.window.get_pointer()[0:2] - x, y = htmlview.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer_x, + pointer_x, pointer_y = htmlview.tv.window.get_pointer()[0:2] + x, y = htmlview.tv.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, pointer_x, pointer_y) - tags = htmlview.get_iter_at_location(x, y).get_tags() + tags = htmlview.tv.get_iter_at_location(x, y).get_tags() if change_cursor: - htmlview.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( + htmlview.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( gtk.gdk.Cursor(gtk.gdk.XTERM)) change_cursor = None - tag_table = htmlview.get_buffer().get_tag_table() + tag_table = htmlview.tv.get_buffer().get_tag_table() for tag in tags: try: if tag.is_anchor: - htmlview.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( + htmlview.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( gtk.gdk.Cursor(gtk.gdk.HAND2)) change_cursor = tag elif tag == tag_table.lookup('focus-out-line'): @@ -994,32 +935,38 @@ #if over_line and not line_tooltip.win: # line_tooltip.timeout = gobject.timeout_add(500, # show_line_tooltip) - # htmlview.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( + # htmlview.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( # gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)) # change_cursor = tag - htmlview.connect('motion_notify_event', on_textview_motion_notify_event) + htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) def handler(texttag, widget, event, iter_, kind, href): if event.type == gtk.gdk.BUTTON_PRESS: print href - htmlview.html_hyperlink_handler = handler + htmlview.tv.html_hyperlink_handler = handler - htmlview.display_html('<div>Hello \n' + htmlview.print_real_text(None, xhtml='<div>Hello \n' ' <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> \n' ' World\n' '</div>\n') - htmlview.display_html('<hr />') - htmlview.display_html(''' + htmlview.print_real_text(None, xhtml='<hr />') + htmlview.print_real_text(None, xhtml=''' OMG, I'm green with envy! ''') - htmlview.display_html('<hr />') - htmlview.display_html(''' + htmlview.print_real_text(None, xhtml='<hr />') + htmlview.print_real_text(None, xhtml=''' + <body xmlns='http://www.w3.org/1999/xhtml'> + http://test.com/ testing links autolinkifying + </body> + ''') + htmlview.print_real_text(None, xhtml='<hr />') + htmlview.print_real_text(None, xhtml=''' <body xmlns='http://www.w3.org/1999/xhtml'> As Emerson said in his essay Self-Reliance: @@ -1027,8 +974,8 @@ </body>

1 0

gajim: add a interface.run() function to really start Interface
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset 6d21fdb509fa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6d21fdb509fa description: add a interface.run() function to really start Interface diffstat: src/gajim.py | 86 ++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 41 deletions(-) diffs (125 lines): diff -r 2d8f809cfd5a -r 6d21fdb509fa src/gajim.py --- a/src/gajim.py Wed Sep 23 17:35:42 2009 +0200 +++ b/src/gajim.py Wed Sep 23 18:54:35 2009 +0200 @@ -3347,6 +3347,49 @@ view.updateNamespace({'gajim': gajim}) gajim.ipython_window = window + def run(self): + if self.systray_capabilities and gajim.config.get('trayicon') != 'never': + self.show_systray() + + self.roster = roster_window.RosterWindow() + for account in gajim.connections: + gajim.connections[account].load_roster_from_db() + + # get instances for windows/dialogs that will show_all()/hide() + self.instances['file_transfers'] = dialogs.FileTransfersWindow() + + gobject.timeout_add(100, self.autoconnect) + timeout, in_seconds = gajim.idlequeue.PROCESS_TIMEOUT + if in_seconds: + gobject.timeout_add_seconds(timeout, self.process_connections) + else: + gobject.timeout_add(timeout, self.process_connections) + gobject.timeout_add_seconds(gajim.config.get( + 'check_idle_every_foo_seconds'), self.read_sleepy) + + # when using libasyncns we need to process resolver in regular intervals + if resolver.USE_LIBASYNCNS: + gobject.timeout_add(200, gajim.resolver.process) + + # setup the indicator + if gajim.HAVE_INDICATOR: + notify.setup_indicator_server() + + def remote_init(): + if gajim.config.get('remote_control'): + try: + import remote_control + self.remote_ctrl = remote_control.Remote() + except Exception: + pass + gobject.timeout_add_seconds(5, remote_init) + + for account in gajim.connections: + if gajim.config.get_per('accounts', account, 'publish_tune') and \ + dbus_support.supported: + self.enable_music_listener() + break + def __init__(self): gajim.interface = self gajim.thread_interface = ThreadInterface @@ -3549,9 +3592,6 @@ if self.systray_capabilities: self.systray = systray.Systray() - if self.systray_capabilities and gajim.config.get('trayicon') != 'never': - self.show_systray() - path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') pix = gtk.gdk.pixbuf_new_from_file(path_to_file) # set the icon to all windows @@ -3560,13 +3600,6 @@ self.init_emoticons() self.make_regexps() - self.roster = roster_window.RosterWindow() - for account in gajim.connections: - gajim.connections[account].load_roster_from_db() - - # get instances for windows/dialogs that will show_all()/hide() - self.instances['file_transfers'] = dialogs.FileTransfersWindow() - # get transports type from DB gajim.transport_type = gajim.logger.get_transports_type() @@ -3594,37 +3627,7 @@ self.last_ftwindow_update = 0 - gobject.timeout_add(100, self.autoconnect) - timeout, in_seconds = gajim.idlequeue.PROCESS_TIMEOUT - if in_seconds: - gobject.timeout_add_seconds(timeout, self.process_connections) - else: - gobject.timeout_add(timeout, self.process_connections) - gobject.timeout_add_seconds(gajim.config.get( - 'check_idle_every_foo_seconds'), self.read_sleepy) - - # when using libasyncns we need to process resolver in regular intervals - if resolver.USE_LIBASYNCNS: - gobject.timeout_add(200, gajim.resolver.process) - - # setup the indicator - if gajim.HAVE_INDICATOR: - notify.setup_indicator_server() - - def remote_init(): - if gajim.config.get('remote_control'): - try: - import remote_control - self.remote_ctrl = remote_control.Remote() - except Exception: - pass - gobject.timeout_add_seconds(5, remote_init) self.music_track_changed_signal = None - for account in gajim.connections: - if gajim.config.get_per('accounts', account, 'publish_tune') and \ - dbus_support.supported: - self.enable_music_listener() - break if __name__ == '__main__': def sigint_cb(num, stack): @@ -3663,7 +3666,8 @@ check_paths.check_and_possibly_create_paths() - Interface() + interface = Interface() + interface.run() try: if os.name != 'nt':

1 0

← Newer
1
2
3
4
5
6
7
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009