Commits

commits@gajim.org

17632 discussions

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 22 Jul '13

22 Jul '13

changeset c05a63821060 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c05a63821060 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 1147 ++++++++++++++++++++++++++++--------------------------------- 1 файлов изменено, 535 вставок(+), 612 удалений(-) различия (урезанные с 2677 до 300 строк): diff -r 563ee67daa88 -r c05a63821060 po/he.po --- a/po/he.po Sun Jul 21 23:26:58 2013 +0400 +++ b/po/he.po Mon Jul 22 11:17:24 2013 +0400 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-15 12:02+0400\n" -"PO-Revision-Date: 2013-07-15 13:47+0200\n" -"Last-Translator: Darlan <xmpp:israeli@failar.nu>\n" +"POT-Creation-Date: 2013-07-19 09:31+0300\n" +"PO-Revision-Date: 2013-07-21 07:57+0200\n" +"Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" "MIME-Version: 1.0\n" @@ -143,7 +143,7 @@ # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." -msgstr " ניהל... " +msgstr " ניהול... " # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:17 @@ -186,7 +186,7 @@ # מיידית לאחר ש #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר מידית כאשר אני אלחץ על סיום" +msgstr "התחבר מידית כאשר אני אלחץ על סיים" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -194,7 +194,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:29 msgid "_Finish" -msgstr "_סיום" +msgstr "_סיים" #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 @@ -414,7 +414,7 @@ #: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 msgid "_Manage..." -msgstr " ניה_ל... " +msgstr " ניהו_ל... " #: ../data/gui/accounts_window.ui.h:40 msgid "Proxy" @@ -665,7 +665,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:10 msgid "F_inish" -msgstr "_סיום" +msgstr "_סיים" #: ../data/gui/advanced_configuration_window.ui.h:1 msgid "Advanced Configuration Editor" @@ -812,7 +812,7 @@ #: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5805 #: ../src/roster_window.py:5932 ../src/roster_window.py:6065 msgid "_Unblock" -msgstr "_ביטול חסימה" +msgstr "_בטל חסימה" #: ../data/gui/change_activity_dialog.ui.h:1 msgid "Set Activity" @@ -1244,7 +1244,7 @@ #: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1089 msgid "Bold" -msgstr "מודגש" +msgstr "מובלט" #: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1090 msgid "Italic" @@ -1252,7 +1252,7 @@ #: ../data/gui/gajim_themes_window.ui.h:12 msgid "Paused" -msgstr "הופסקה" +msgstr "השהיה" #: ../data/gui/gajim_themes_window.ui.h:13 msgid "Composing" @@ -1265,12 +1265,11 @@ # Chat-state? #: ../data/gui/gajim_themes_window.ui.h:15 msgid "Chatstate Tab Colors" -msgstr "צבעי לשונית מצב שיחה" - -# נעזב +msgstr "צבעי כרטיסייה מצב שיחה" + #: ../data/gui/gajim_themes_window.ui.h:16 msgid "Gone" -msgstr "עזוב" +msgstr "נטישה" #: ../data/gui/gajim_themes_window.ui.h:17 msgid "" @@ -1320,7 +1319,7 @@ msgstr "_בקש/י שקולך ישמע" # _סימנייה -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1827 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1839 msgid "_Bookmark" msgstr "_סמן" @@ -1341,7 +1340,7 @@ # _קול #: ../data/gui/gc_occupants_menu.ui.h:4 msgid "_Voice" -msgstr "ה_שמעה" +msgstr "ה_שמע" #: ../data/gui/gc_occupants_menu.ui.h:5 msgid "Mo_derator" @@ -1361,12 +1360,12 @@ #: ../data/gui/gc_occupants_menu.ui.h:9 msgid "_Kick" -msgstr "ב_עיטה" +msgstr "ב_עט" # א_סירה #: ../data/gui/gc_occupants_menu.ui.h:10 msgid "_Ban" -msgstr "ח_סימה" +msgstr "ח_סום" #: ../data/gui/gc_occupants_menu.ui.h:12 msgid "_Add to Roster" @@ -1448,15 +1447,15 @@ msgstr "" "אזהרה:\n" "אם בכוונתך לבצע מחיקה בקנה מידה גדול, אנא ודא כי היישום Gajim אינו מורץ. " -"באופן כללי מוטב להימנע ממחיקות עם אנשי קשר שמשוחחים עמך כעת." +"באופן כללי מוטב להימנע ממחיקות עם אנשי קשר אשר משוחחים עמך כעת." #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" -msgstr "_חפש במסד נתונים" +msgstr "_חפש בתוך מסד נתונים" #: ../data/gui/history_manager.ui.h:9 msgid "Export" -msgstr "יצוא" +msgstr "יצא" #: ../data/gui/history_window.ui.h:1 msgid "Enter JID or Contact name" @@ -1480,11 +1479,11 @@ #: ../data/gui/history_window.ui.h:6 msgid "_In date search" -msgstr "חיפוש _בתאריך" +msgstr "חפש בתוך _תאריך" #: ../data/gui/history_window.ui.h:7 msgid "searching only in the selected day " -msgstr "חיפוש ביום הנבחר בלבד" +msgstr "חיפוש בתוך היום הנבחר בלבד" #: ../data/gui/history_window.ui.h:8 #: ../data/gui/zeroconf_information_window.ui.h:5 @@ -1493,16 +1492,14 @@ #: ../data/gui/history_window.ui.h:9 msgid "_Show status changes" -msgstr "הצג _שינויי של מצב חיבור" - -# פקע, נפקע +msgstr "הצג _שינויים של מצב" + +# פגה, פקע, נפקע #: ../data/gui/item_archiving_preferences_window.ui.h:1 -#, fuzzy msgid "expire" -msgstr "פגה" +msgstr "פוקעת" #: ../data/gui/item_archiving_preferences_window.ui.h:2 -#, fuzzy msgid "save" msgstr "שמור" @@ -1517,59 +1514,45 @@ msgstr "" #: ../data/gui/item_archiving_preferences_window.ui.h:5 -#, fuzzy msgid "body" msgstr "גוף" #: ../data/gui/item_archiving_preferences_window.ui.h:6 -#, fuzzy msgid "false" -msgstr "false" - -# gajim-remote +msgstr "שווא" + #: ../data/gui/item_archiving_preferences_window.ui.h:7 -#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133 -#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158 -#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282 -#, fuzzy msgid "message" msgstr "הודעה" #: ../data/gui/item_archiving_preferences_window.ui.h:8 -#, fuzzy msgid "stream" msgstr "זרם" #: ../data/gui/item_archiving_preferences_window.ui.h:9 -#, fuzzy msgid "approve" msgstr "אשר" #: ../data/gui/item_archiving_preferences_window.ui.h:10 -#, fuzzy msgid "concede" msgstr "וותר" #: ../data/gui/item_archiving_preferences_window.ui.h:11 -#, fuzzy msgid "forbid" msgstr "אסור" # להימנע # conflict? #: ../data/gui/item_archiving_preferences_window.ui.h:12 -#, fuzzy msgid "oppose" msgstr "התנגד" #: ../data/gui/item_archiving_preferences_window.ui.h:13 -#, fuzzy msgid "prefer" msgstr "העדף" # נדרש #: ../data/gui/item_archiving_preferences_window.ui.h:14 -#, fuzzy msgid "require" msgstr "דרוש" @@ -1615,7 +1598,7 @@ msgstr "_עיון ברשימת חדרים" #: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3376 -#: ../src/disco.py:1380 ../src/disco.py:1831 +#: ../src/disco.py:1392 ../src/disco.py:1843 msgid "_Join" msgstr "_כנס" @@ -1719,6 +1702,10 @@ msgid "Settings" msgstr "הגדרות" +#: ../data/gui/manage_sounds_window.ui.h:1 +msgid "Manage sounds" +msgstr "ניהול צלילים" + # צירוף־מעבר # משפט/צירוף # אישור/מעבר/מפתח @@ -2001,11 +1988,11 @@ #: ../data/gui/preferences_window.ui.h:43 msgid "Notify me about contacts that sign _in" -msgstr "הודע לי אודות אנשי קשר שמת_חברים" +msgstr "הודע לי אודות אנשי קשר אשר ת_חברים" #: ../data/gui/preferences_window.ui.h:44 msgid "Notify me about contacts that sign _out" -msgstr "הודע לי אודות אנשי קשר שמת_נתקים" +msgstr "הודע לי אודות אנשי קשר אשר ת_נתקים" # signed out # יידעך @@ -2071,7 +2058,7 @@ # ניהול _אירועי צליל... #: ../data/gui/preferences_window.ui.h:55 msgid "Ma_nage..." -msgstr " ניה_ל... " +msgstr " ניהו_ל... " # בהיותי #: ../data/gui/preferences_window.ui.h:56 @@ -2282,11 +2269,10 @@ msgid "_URL highlight:" msgstr "הבלטת _URL:"

1 0

gajim: update toolbar when the status has changed
by Denis Fomin 21 Jul '13

21 Jul '13

changeset 563ee67daa88 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=563ee67daa88 description: update toolbar when the status has changed diffstat: src/chat_control.py | 2 ++ 1 файлов изменено, 2 вставок(+), 0 удалений(-) различия (19 строк): diff -r 8e8bdab2a72c -r 563ee67daa88 src/chat_control.py --- a/src/chat_control.py Sun Jul 21 20:44:36 2013 +0200 +++ b/src/chat_control.py Sun Jul 21 23:26:58 2013 +0400 @@ -1466,6 +1466,7 @@ self.msg_textview.set_sensitive(True) self.msg_textview.set_editable(True) # FIXME: Set sensitivity for toolbar + self.update_toolbar() def got_disconnected(self): self.msg_textview.set_sensitive(False) @@ -1474,6 +1475,7 @@ self.no_autonegotiation = False # FIXME: Set sensitivity for toolbar + self.update_toolbar() ################################################################################

1 0

gajim: fix showing correct previous sent message. Fixes #7361
by Yann Leboulanger 21 Jul '13

21 Jul '13

changeset 8e8bdab2a72c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8e8bdab2a72c description: fix showing correct previous sent message. Fixes #7361 diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 109edd779142 -r 8e8bdab2a72c src/chat_control.py --- a/src/chat_control.py Sun Jul 21 20:37:05 2013 +0200 +++ b/src/chat_control.py Sun Jul 21 20:44:36 2013 +0200 @@ -900,7 +900,7 @@ def _cb(msg, cb, *cb_args): self.last_sent_msg = msg - self.last_sent_txt = cb_args[1] + self.last_sent_txt = cb_args[0] if cb: cb(msg, *cb_args)

1 0

gajim: fix placing corrected message when it contains special te...
by Yann Leboulanger 21 Jul '13

21 Jul '13

changeset 109edd779142 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=109edd779142 description: fix placing corrected message when it contains special text. Fixes #7372 diffstat: src/conversation_textview.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 3ac9ab784e1d -r 109edd779142 src/conversation_textview.py --- a/src/conversation_textview.py Fri Jul 19 21:12:11 2013 +0200 +++ b/src/conversation_textview.py Sun Jul 21 20:37:05 2013 +0200 @@ -1085,7 +1085,6 @@ special_text = otext[start:end] if start > index: text_before_special_text = otext[index:start] - end_iter = buffer_.get_end_iter() # we insert normal text insert_tags_func(end_iter, text_before_special_text, *other_tags) index = end # update index

1 0

gajim: improve error message when we cannot connect to a host vi...
by Yann Leboulanger 19 Jul '13

19 Jul '13

changeset 3ac9ab784e1d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3ac9ab784e1d description: improve error message when we cannot connect to a host via a proxy. Fixes #7358 diffstat: src/common/connection.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r bfbe326b681c -r 3ac9ab784e1d src/common/connection.py --- a/src/common/connection.py Fri Jul 19 15:49:47 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 21:12:11 2013 +0200 @@ -1262,7 +1262,12 @@ # we are not retrying, and not conecting if not self.retrycount and self.connected != 0: self.disconnect(on_purpose = True) - pritxt = _('Could not connect to "%s"') % self._hostname + if self._proxy: + pritxt = _('Could not connect to "%(host)s" via proxy "%(proxy)s"') %\ + {'host': self._hostname, 'proxy': self._proxy['host']} + else: + pritxt = _('Could not connect to "%(host)s"') % {'host': \ + self._hostname} sectxt = _('Check your connection or try again later.') if self.streamError: # show error dialog

1 0

gajim: remove unused print
by Denis Fomin 19 Jul '13

19 Jul '13

changeset bfbe326b681c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bfbe326b681c description: remove unused print diffstat: src/vcard.py | 1 - 1 файлов изменено, 0 вставок(+), 1 удалений(-) различия (11 строк): diff -r 174e46c8f015 -r bfbe326b681c src/vcard.py --- a/src/vcard.py Fri Jul 19 12:46:09 2013 +0200 +++ b/src/vcard.py Fri Jul 19 15:49:47 2013 +0400 @@ -250,7 +250,6 @@ 'ORG_ORGNAME', 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'EMAIL_WORK_USERID', 'TEL_WORK_NUMBER'): widget = self.xml.get_object(l + '_label') - print l widget.set_text('') for pref in ('ADR_HOME', 'ADR_WORK'): for l in ('STREET', 'EXTADR', 'LOCALITY', 'PCODE', 'REGION',

1 0

gajim: remove no more needed send_gc_message function
by Yann Leboulanger 19 Jul '13

19 Jul '13

changeset 174e46c8f015 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=174e46c8f015 description: remove no more needed send_gc_message function diffstat: src/common/connection.py | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diffs (43 lines): diff -r 328b8eb57261 -r 174e46c8f015 src/common/connection.py --- a/src/common/connection.py Fri Jul 19 14:36:46 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 12:46:09 2013 +0200 @@ -2571,39 +2571,6 @@ t.setTagData('password', password) self.connection.send(p) - def send_gc_message(self, jid, msg, xhtml=None, label=None, - correction_msg=None, callback=None): - if not gajim.account_is_connected(self.name): - return - if correction_msg: - id_ = correction_msg.getID() - if correction_msg.getTag('replace'): - correction_msg.delChild('replace') - correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) - id2 = self.connection.getAnID() - correction_msg.setID(id2) - correction_msg.setBody(msg) - if xhtml: - correction_msg.setXHTML(xhtml) - self.connection.send(correction_msg) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=None, chatstate=None)) - if callback: - callback(correction_msg, msg) - return - if not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): - from common.rst_xhtml_generator import create_xhtml - xhtml = create_xhtml(msg) - msg_iq = nbxmpp.Message(jid, msg, typ='groupchat', xhtml=xhtml) - if label is not None: - msg_iq.addChild(node=label) - self.connection.send(msg_iq) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=None, chatstate=None)) - if callback: - callback(msg_iq, msg) - def _nec_gc_message_outgoing(self, obj): if obj.account != self.name: return

1 0

gajim: typo
by Denis Fomin 19 Jul '13

19 Jul '13

changeset 328b8eb57261 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=328b8eb57261 description: typo diffstat: src/common/connection.py | 2 +- src/remote_control.py | 1 - 2 файлов изменено, 1 вставок(+), 2 удалений(-) различия (23 строк): diff -r 9063d415697c -r 328b8eb57261 src/common/connection.py --- a/src/common/connection.py Fri Jul 19 13:52:37 2013 +0400 +++ b/src/common/connection.py Fri Jul 19 14:36:46 2013 +0400 @@ -771,7 +771,7 @@ self._nec_agent_info_received) gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) - gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, + gajim.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) def get_config_values_or_default(self): diff -r 9063d415697c -r 328b8eb57261 src/remote_control.py --- a/src/remote_control.py Fri Jul 19 13:52:37 2013 +0400 +++ b/src/remote_control.py Fri Jul 19 14:36:46 2013 +0400 @@ -479,7 +479,6 @@ connected_account = self._get_account_for_groupchat(account, room_jid) if connected_account: connection = gajim.connections[connected_account] - connection.send_gc_message(room_jid, message) gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, account=connected_account, jid=room_jid, message=message)) return DBUS_BOOLEAN(True)

1 0

gajim: handle gc outgoing messages with events.
by Denis Fomin 19 Jul '13

19 Jul '13

changeset 9063d415697c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9063d415697c description: handle gc outgoing messages with events. diffstat: src/common/connection.py | 40 ++++++++++++++++++++++++++++++++ src/common/connection_handlers_events.py | 19 +++++++++++++++ src/groupchat_control.py | 8 ++++-- src/remote_control.py | 6 ++++- 4 файлов изменено, 69 вставок(+), 4 удалений(-) различия (141 строк): diff -r 86cde3607340 -r 9063d415697c src/common/connection.py --- a/src/common/connection.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/common/connection.py Fri Jul 19 13:52:37 2013 +0400 @@ -757,6 +757,8 @@ self._nec_agent_info_received) gajim.ged.register_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) + gajim.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, + self._nec_gc_message_outgoing) # END __init__ def cleanup(self): @@ -769,6 +771,8 @@ self._nec_agent_info_received) gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, self._nec_message_outgoing) + gajim.ged.remove_event_handler('message-outgoing', ged.OUT_CORE, + self._nec_gc_message_outgoing) def get_config_values_or_default(self): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): @@ -2600,6 +2604,42 @@ if callback: callback(msg_iq, msg) + def _nec_gc_message_outgoing(self, obj): + if obj.account != self.name: + return + if not gajim.account_is_connected(self.name): + return + + if obj.correction_msg: + id_ = obj.correction_msg.getID() + if obj.correction_msg.getTag('replace'): + obj.correction_msg.delChild('replace') + obj.correction_msg.setTag('replace', attrs={'id': id_}, + namespace=nbxmpp.NS_CORRECT) + id2 = self.connection.getAnID() + obj.correction_msg.setID(id2) + obj.correction_msg.setBody(obj.message) + if obj.xhtml: + obj.correction_msg.setXHTML(xhtml) + self.connection.send(obj.correction_msg) + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + if obj.callback: + obj.callback(obj.correction_msg, obj.message) + return + if not obj.xhtml and gajim.config.get('rst_formatting_outgoing_messages'): + from common.rst_xhtml_generator import create_xhtml + obj.xhtml = create_xhtml(obj.message) + msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', + xhtml=obj.xhtml) + if obj.label is not None: + msg_iq.addChild(node=label) + self.connection.send(msg_iq) + gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, + jid=obj.jid, message=obj.message, keyID=None, chatstate=None)) + if obj.callback: + obj.callback(msg_iq, obj.message) + def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): return diff -r 86cde3607340 -r 9063d415697c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/common/connection_handlers_events.py Fri Jul 19 13:52:37 2013 +0400 @@ -2444,6 +2444,25 @@ def generate(self): return True + +class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): + name = 'gc-message-outgoing' + base_network_events = [] + + def init(self): + self.message = '' + self.xhtml = None + self.label = None + self.callback = None + self.callback_args = [] + self.is_loggable = True + self.control = None + self.correction_msg = None + + def generate(self): + return True + + class ClientCertPassphraseEvent(nec.NetworkIncomingEvent): name = 'client-cert-passphrase' base_network_events = [] diff -r 86cde3607340 -r 9063d415697c src/groupchat_control.py --- a/src/groupchat_control.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/groupchat_control.py Fri Jul 19 13:52:37 2013 +0400 @@ -54,6 +54,7 @@ from command_system.implementation.hosts import PrivateChatCommands from command_system.implementation.hosts import GroupChatCommands +from common.connection_handlers_events import GcMessageOutgoingEvent import logging log = logging.getLogger('gajim.groupchat_control') @@ -1923,9 +1924,10 @@ else: correction_msg = None # Send the message - gajim.connections[self.account].send_gc_message(self.room_jid, - message, xhtml=xhtml, label=label, - correction_msg=correction_msg, callback=_cb) + gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, + account=self.account, jid=self.room_jid, message=message, + xhtml=xhtml, label=label, callback=_cb, + callback_args=[_cb] + [message], correction_msg=correction_msg)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() diff -r 86cde3607340 -r 9063d415697c src/remote_control.py --- a/src/remote_control.py Thu Jul 18 21:14:39 2013 +0200 +++ b/src/remote_control.py Fri Jul 19 13:52:37 2013 +0400 @@ -37,7 +37,9 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged -from common.connection_handlers_events import MessageOutgoingEvent +from common.connection_handlers_events import MessageOutgoingEvent, + GcMessageOutgoingEvent + from common import dbus_support if dbus_support.supported: @@ -478,6 +480,8 @@ if connected_account: connection = gajim.connections[connected_account] connection.send_gc_message(room_jid, message) + gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, + account=connected_account, jid=room_jid, message=message)) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False)

1 0

gajim: clear vcard values before filling them in case we receive...
by Yann Leboulanger 18 Jul '13

18 Jul '13

changeset 86cde3607340 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=86cde3607340 description: clear vcard values before filling them in case we receive vcard a second time when window is opened. Fixes #7366 diffstat: src/vcard.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diffs (34 lines): diff -r 1b27a435304d -r 86cde3607340 src/vcard.py --- a/src/vcard.py Thu Jul 18 20:32:45 2013 +0200 +++ b/src/vcard.py Thu Jul 18 21:14:39 2013 +0200 @@ -244,6 +244,22 @@ self.vcard_arrived = True self.test_remove_progressbar() + def clear_values(self): + for l in ('FN', 'NICKNAME', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', + 'N_PREFIX', 'N_SUFFIX', 'EMAIL_HOME_USERID', 'TEL_HOME_NUMBER', 'BDAY', + 'ORG_ORGNAME', 'ORG_ORGUNIT', 'TITLE', 'ROLE', 'EMAIL_WORK_USERID', + 'TEL_WORK_NUMBER'): + widget = self.xml.get_object(l + '_label') + print l + widget.set_text('') + for pref in ('ADR_HOME', 'ADR_WORK'): + for l in ('STREET', 'EXTADR', 'LOCALITY', 'PCODE', 'REGION', + 'CTRY'): + widget = self.xml.get_object(pref + '_' + l + '_label') + widget.set_text('') + self.xml.get_object('DESC_textview').get_buffer().set_text('') + + def _nec_vcard_received(self, obj): if obj.conn.name != self.account: return @@ -254,6 +270,7 @@ else: if obj.jid != self.contact.jid: return + self.clear_values() self.set_values(obj.vcard_dict) def test_remove_progressbar(self):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits