Commits September 2016

commits@gajim.org

1 participants
78 discussions

gajim: Added new gui extension point 'print_real_text' which is ...
by Gajim 05 Sep '16

05 Sep '16

changeset 2caf7d2aaea7 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2caf7d2aaea7 description: Added new gui extension point 'print_real_text' which is executed before the message line is printed diffstat: src/conversation_textview.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (26 lines): diff -r 3b09dc50a020 -r 2caf7d2aaea7 src/conversation_textview.py --- a/src/conversation_textview.py Mon Sep 05 19:02:43 2016 +0200 +++ b/src/conversation_textview.py Mon Sep 05 20:24:13 2016 +0200 @@ -1102,7 +1102,6 @@ (emots, links, formatting) """ - # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False gajim.plugin_manager.gui_extension_point('print_special_text', self, @@ -1488,6 +1487,14 @@ if name and (text.startswith('/me ') or text.startswith('/me\n')): text = '* ' + name + text[3:] text_tags.append('italic') + + # PluginSystem: adding GUI extension point for ConversationTextview + self.plugin_modified = False + gajim.plugin_manager.gui_extension_point('print_real_text', self, + text, text_tags, graphics, iter_, additional_data) + if self.plugin_modified: + return self.tv.get_buffer().get_end_iter() + # detect urls formatting and if the user has it on emoticons return self.detect_and_print_special_text(text, text_tags, graphics=graphics, iter_=iter_, additional_data=additional_data)

1 0

gajim: Minimize groupchats by default, fixes #8369
by Gajim 05 Sep '16

05 Sep '16

changeset 3b09dc50a020 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3b09dc50a020 description: Minimize groupchats by default, fixes #8369 diffstat: src/chat_control.py | 22 +++++++++++----------- src/common/config.py | 2 +- src/common/optparser.py | 3 +++ src/groupchat_control.py | 8 ++++---- 4 files changed, 19 insertions(+), 16 deletions(-) diffs (84 lines): diff -r 0ec7f92a322b -r 3b09dc50a020 src/chat_control.py --- a/src/chat_control.py Mon Sep 05 16:12:23 2016 +0200 +++ b/src/chat_control.py Mon Sep 05 19:02:43 2016 +0200 @@ -1112,19 +1112,19 @@ """ When a grouchat is minimized, unparent the tab, put it in roster etc """ - old_value = False - minimized_gc = gajim.config.get_per('accounts', self.account, - 'minimized_gc').split() - if self.contact.jid in minimized_gc: - old_value = True + old_value = True + non_minimized_gc = gajim.config.get_per('accounts', self.account, + 'non_minimized_gc').split() + if self.contact.jid in non_minimized_gc: + old_value = False minimize = widget.get_active() - if minimize and not self.contact.jid in minimized_gc: - minimized_gc.append(self.contact.jid) - if not minimize and self.contact.jid in minimized_gc: - minimized_gc.remove(self.contact.jid) + if not minimize and not self.contact.jid in non_minimized_gc: + non_minimized_gc.append(self.contact.jid) + if minimize and self.contact.jid in non_minimized_gc: + non_minimized_gc.remove(self.contact.jid) if old_value != minimize: - gajim.config.set_per('accounts', self.account, 'minimized_gc', - ' '.join(minimized_gc)) + gajim.config.set_per('accounts', self.account, 'non_minimized_gc', + ' '.join(non_minimized_gc)) def set_control_active(self, state): if state: diff -r 0ec7f92a322b -r 3b09dc50a020 src/common/config.py --- a/src/common/config.py Mon Sep 05 16:12:23 2016 +0200 +++ b/src/common/config.py Mon Sep 05 19:02:43 2016 +0200 @@ -368,7 +368,7 @@ 'no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], 'sync_logs_with_server': [ opt_bool, True, _('Download logs stored on server on Gajim startup if server supports XEP-0136 or XEP-0313')], 'allow_no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], - 'minimized_gc': [ opt_str, '' ], + 'non_minimized_gc': [ opt_str, '' ], 'attached_gpg_keys': [ opt_str, '' ], 'keep_alives_enabled': [ opt_bool, True, _('Whitespace sent after inactivity')], 'ping_alives_enabled': [ opt_bool, True, _('XMPP ping sent after inactivity')], diff -r 0ec7f92a322b -r 3b09dc50a020 src/common/optparser.py --- a/src/common/optparser.py Mon Sep 05 16:12:23 2016 +0200 +++ b/src/common/optparser.py Mon Sep 05 19:02:43 2016 +0200 @@ -946,6 +946,9 @@ if self.old_values['video_input_device'] == 'videotestsrc is-live=true ! video/x-raw-yuv,framerate=10/1': gajim.config.set('video_input_device', 'videotestsrc is-live=true ! video/x-raw,framerate=10/1') + for account in self.old_values['accounts'].keys(): + gajim.config.del_per('accounts', account, 'minimized_gc') + back = os.getcwd() os.chdir(logger.LOG_DB_FOLDER) con = sqlite.connect(logger.LOG_DB_FILE) diff -r 0ec7f92a322b -r 3b09dc50a020 src/groupchat_control.py --- a/src/groupchat_control.py Mon Sep 05 16:12:23 2016 +0200 +++ b/src/groupchat_control.py Mon Sep 05 19:02:43 2016 +0200 @@ -865,8 +865,8 @@ history_menuitem.add_accelerator('activate', ag, Gdk.KEY_h, Gdk.ModifierType.CONTROL_MASK, Gtk.AccelFlags.VISIBLE) - if self.contact.jid in gajim.config.get_per('accounts', self.account, - 'minimized_gc').split(' '): + if self.contact.jid not in gajim.config.get_per('accounts', self.account, + 'non_minimized_gc').split(' '): minimize_menuitem.set_active(True) conn = gajim.connections[self.account] if not conn.private_storage_supported and (not conn.pubsub_supported or \ @@ -2038,8 +2038,8 @@ return 'visitor' def minimizable(self): - if self.contact.jid in gajim.config.get_per('accounts', self.account, - 'minimized_gc').split(' '): + if self.contact.jid not in gajim.config.get_per('accounts', self.account, + 'non_minimized_gc').split(' '): return True return False

1 0

gajim: Some more points to add the additional_data property
by Gajim 05 Sep '16

05 Sep '16

changeset 0ec7f92a322b in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec7f92a322b description: Some more points to add the additional_data property diffstat: src/common/connection_handlers_events.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 5de52ba869ac -r 0ec7f92a322b src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Sep 05 03:25:37 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Sep 05 16:12:23 2016 +0200 @@ -1826,12 +1826,16 @@ def init(self): self.additional_data = {} + def generate(self): return True class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' base_network_events = [] + + def init(self): + self.additional_data = {} class AgentRemovedEvent(nec.NetworkIncomingEvent): name = 'agent-removed'

1 0

gajim: Added ability to read additional_data from history db and...
by Gajim 05 Sep '16

05 Sep '16

changeset 5de52ba869ac in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5de52ba869ac description: Added ability to read additional_data from history db and use it in gui extension point print_special_text. I also found an iterator reuse in common/logger.py, maybe this fixes bug #8277 diffstat: src/chat_control.py | 11 ++++++----- src/common/logger.py | 23 ++++++++++++++++------- src/conversation_textview.py | 26 +++++++++++++------------- src/history_window.py | 11 ++++++----- src/roster_window.py | 3 ++- 5 files changed, 43 insertions(+), 31 deletions(-) diffs (287 lines): diff -r caab0e5dfbde -r 5de52ba869ac src/chat_control.py --- a/src/chat_control.py Mon Sep 05 01:43:39 2016 +0200 +++ b/src/chat_control.py Mon Sep 05 03:25:37 2016 +0200 @@ -849,7 +849,7 @@ other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, - correct_id=None): + correct_id=None, additional_data={}): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -874,12 +874,12 @@ # this is for carbon copied messages that are sent from another # resource self.conv_textview.correct_last_sent_message(text, xhtml, - self.get_our_nick(), old_txt) + self.get_our_nick(), old_txt, additional_data=additional_data) else: textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, subject, old_kind, xhtml, simple=simple, graphics=graphics, - displaymarking=displaymarking) + displaymarking=displaymarking, additional_data=additional_data) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) @@ -2973,8 +2973,9 @@ rows = [] local_old_kind = None self.conv_textview.just_cleared = True - for row in rows: # row[0] time, row[1] has kind, row[2] the message + for row in rows: # row[0] time, row[1] has kind, row[2] the message, row[3] subject, row[4] additional_data msg = row[2] + additional_data = row[4] if not msg: # message is empty, we don't print it continue if row[1] in (constants.KIND_CHAT_MSG_SENT, @@ -3004,7 +3005,7 @@ ChatControlBase.print_conversation_line(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml) + old_kind=local_old_kind, xhtml=xhtml, additional_data=additional_data) if row[2].startswith('/me ') or row[2].startswith('/me\n'): local_old_kind = None else: diff -r caab0e5dfbde -r 5de52ba869ac src/common/logger.py --- a/src/common/logger.py Mon Sep 05 01:43:39 2016 +0200 +++ b/src/common/logger.py Mon Sep 05 03:25:37 2016 +0200 @@ -472,10 +472,10 @@ try: self.cur.execute( 'SELECT message_id, shown from unread_messages') - results = self.cur.fetchall() + unread_results = self.cur.fetchall() except Exception: - pass - for message in results: + unread_results = [] + for message in unread_results: msg_log_id = message[0] shown = message[1] # here we get infos for that message, and related jid from jids table @@ -483,7 +483,7 @@ # that called this function self.cur.execute(''' SELECT logs.log_line_id, logs.message, logs.time, logs.subject, - jids.jid + jids.jid, logs.additional_data FROM logs, jids WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id ''' % msg_log_id @@ -493,7 +493,10 @@ # Log line is no more in logs table. remove it from unread_messages self.set_read_messages([msg_log_id]) continue - all_messages.append(results[0] + (shown,)) + results[0] = list(results[0]) + results[0][5] = json.loads(results[0][5]) + results[0][6] = shown + all_messages.append(results[0]) return all_messages def write(self, kind, jid, message=None, show=None, tim=None, subject=None, additional_data={}): @@ -603,7 +606,7 @@ # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: self.cur.execute(''' - SELECT time, kind, message, subject FROM logs + SELECT time, kind, message, subject, additional_data FROM logs WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d ORDER BY time DESC LIMIT %d OFFSET %d ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, @@ -612,6 +615,9 @@ restore_how_many_rows, pending_how_many), jid_tuple) results = self.cur.fetchall() + for entry in results: + entry = list(entry) + entry[4] = json.loads(entry[4]) except sqlite.DatabaseError: raise exceptions.DatabaseMalformed results.reverse() @@ -646,13 +652,16 @@ last_second_of_day = start_of_day + seconds_in_a_day - 1 self.cur.execute(''' - SELECT contact_name, time, kind, show, message, subject FROM logs + SELECT contact_name, time, kind, show, message, subject, additional_data FROM logs WHERE (%s) AND time BETWEEN %d AND %d ORDER BY time ''' % (where_sql, start_of_day, last_second_of_day), jid_tuple) results = self.cur.fetchall() + for entry in results: + entry = list(entry) + entry[6] = json.loads(entry[6]) return results def get_search_results_for_query(self, jid, query, account, year=False, diff -r caab0e5dfbde -r 5de52ba869ac src/conversation_textview.py --- a/src/conversation_textview.py Mon Sep 05 01:43:39 2016 +0200 +++ b/src/conversation_textview.py Mon Sep 05 03:25:37 2016 +0200 @@ -460,7 +460,7 @@ self.tv.add_child_at_anchor(img, anchor) buffer_.end_user_action() - def correct_last_sent_message(self, message, xhtml, name, old_txt): + def correct_last_sent_message(self, message, xhtml, name, old_txt, additional_data={}): m1 = self.last_sent_message_marks[0] m2 = self.last_sent_message_marks[1] buffer_ = self.tv.get_buffer() @@ -472,7 +472,7 @@ if message.startswith('/me'): tag = 'outgoing' i2 = self.print_conversation_line(message, '', 'outgoing', name, None, - xhtml=xhtml, iter_=i1) + xhtml=xhtml, iter_=i1, additional_data=additional_data) tt_txt = _('Message was corrected. Last message was:\n %s') % \ GLib.markup_escape_text(old_txt) self.show_corrected_message_warning(i2, tt_txt) @@ -480,7 +480,7 @@ left_gravity=True) def correct_last_received_message(self, message, xhtml, name, old_txt, - other_tags_for_name=[], other_tags_for_text=[]): + other_tags_for_name=[], other_tags_for_text=[], additional_data={}): if name not in self.last_received_message_marks: return m1 = self.last_received_message_marks[name][0] @@ -492,7 +492,7 @@ buffer_.delete(i1, i2) i2 = self.print_conversation_line(message, '', 'incoming', name, None, other_tags_for_name=other_tags_for_name, - other_tags_for_text=other_tags_for_text, xhtml=xhtml, iter_=i1) + other_tags_for_text=other_tags_for_text, xhtml=xhtml, iter_=i1, additional_data=additional_data) tt_txt = _('Message was corrected. Last message was:\n %s') % \ GLib.markup_escape_text(old_txt) self.show_corrected_message_warning(i2, tt_txt) @@ -1031,7 +1031,7 @@ helpers.launch_browser_mailer(kind, word) def detect_and_print_special_text(self, otext, other_tags, graphics=True, - iter_=None): + iter_=None, additional_data={}): """ Detect special text (emots & links & formatting), print normal text before any special text it founds, then print special text (that happens @@ -1085,7 +1085,7 @@ # now print it self.print_special_text(special_text, other_tags, graphics=graphics, - iter_=end_iter) + iter_=end_iter, additional_data=additional_data) specials_limit -= 1 if specials_limit <= 0: break @@ -1096,7 +1096,7 @@ return end_iter def print_special_text(self, special_text, other_tags, graphics=True, - iter_=None): + iter_=None, additional_data={}): """ Is called by detect_and_print_special_text and prints special text (emots, links, formatting) @@ -1106,7 +1106,7 @@ # PluginSystem: adding GUI extension point for ConversationTextview self.plugin_modified = False gajim.plugin_manager.gui_extension_point('print_special_text', self, - special_text, other_tags, graphics) + special_text, other_tags, graphics, additional_data) if self.plugin_modified: return @@ -1247,7 +1247,7 @@ def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None, iter_=None): + displaymarking=None, iter_=None, additional_data={}): """ Print 'chat' type messages """ @@ -1352,7 +1352,7 @@ else: self.print_real_text(gajim.config.get( 'chat_merge_consecutive_nickname_indent'), - iter_=end_iter) + iter_=end_iter, additional_data=additional_data) else: self.print_name(name, kind, other_tags_for_name, direction_mark=direction_mark, iter_=end_iter) @@ -1366,7 +1366,7 @@ mark1 = mark self.print_subject(subject, iter_=end_iter) self.print_real_text(text, text_tags, name, xhtml, graphics=graphics, - iter_=end_iter) + iter_=end_iter, additional_data=additional_data) if not iter_ and mark1: mark2 = buffer_.create_mark(None, buffer_.get_end_iter(), left_gravity=True) @@ -1470,7 +1470,7 @@ self.print_empty_line(end_iter) def print_real_text(self, text, text_tags=[], name=None, xhtml=None, - graphics=True, iter_=None): + graphics=True, iter_=None, additional_data={}): """ Add normal and special text. call this to add text """ @@ -1490,4 +1490,4 @@ text_tags.append('italic') # detect urls formatting and if the user has it on emoticons return self.detect_and_print_special_text(text, text_tags, graphics=graphics, - iter_=iter_) + iter_=iter_, additional_data=additional_data) diff -r caab0e5dfbde -r 5de52ba869ac src/history_window.py --- a/src/history_window.py Mon Sep 05 01:43:39 2016 +0200 +++ b/src/history_window.py Mon Sep 05 03:25:37 2016 +0200 @@ -399,14 +399,15 @@ # contact_name, time, kind, show, message for line in lines: # line[0] is contact_name, line[1] is time of message - # line[2] is kind, line[3] is show, line[4] is message + # line[2] is kind, line[3] is show, line[4] is message, line[5] is subject + # line[6] is additional_data if not show_status and line[2] in (constants.KIND_GCSTATUS, constants.KIND_STATUS): continue self._add_new_line(line[0], line[1], line[2], line[3], line[4], - line[5]) + line[5], line[6]) - def _add_new_line(self, contact_name, tim, kind, show, message, subject): + def _add_new_line(self, contact_name, tim, kind, show, message, subject, additional_data): """ Add a new line in textbuffer """ @@ -509,10 +510,10 @@ if tag_msg: self.history_textview.print_real_text(message, [tag_msg], - name=contact_name, xhtml=xhtml) + name=contact_name, xhtml=xhtml, additional_data=additional_data) else: self.history_textview.print_real_text(message, name=contact_name, - xhtml=xhtml) + xhtml=xhtml, additional_data=additional_data) buffer_ = self.history_textview.tv.get_buffer() eob = buffer_.get_end_iter() buffer_.insert_with_tags_by_name(eob, '\n', 'eol') diff -r caab0e5dfbde -r 5de52ba869ac src/roster_window.py --- a/src/roster_window.py Mon Sep 05 01:43:39 2016 +0200 +++ b/src/roster_window.py Mon Sep 05 03:25:37 2016 +0200 @@ -1850,7 +1850,8 @@ results = gajim.logger.get_unread_msgs() for result in results: jid = result[4] - shown = result[5] + additional_data = result[5] + shown = result[6] if gajim.contacts.get_first_contact_from_jid(account, jid) and not \ shown: # We have this jid in our contacts list

1 0

gajim: Corrected last commit and added ability to set and log ad...
by Gajim 04 Sep '16

04 Sep '16

changeset caab0e5dfbde in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=caab0e5dfbde description: Corrected last commit and added ability to set and log additional_data for outgoing messages as well (and for gc messages, too) diffstat: src/common/configpaths.py | 12 ++++++------ src/common/connection.py | 20 ++++++++++---------- src/common/connection_handlers_events.py | 17 ++++++++++------- src/common/logger.py | 4 +--- 4 files changed, 27 insertions(+), 26 deletions(-) diffs (205 lines): diff -r 127cb0ebcec1 -r caab0e5dfbde src/common/configpaths.py --- a/src/common/configpaths.py Mon Sep 05 00:10:50 2016 +0200 +++ b/src/common/configpaths.py Mon Sep 05 01:43:39 2016 +0200 @@ -148,23 +148,23 @@ 'RNG_SEED': 'rng_seed', 'SECRETS_FILE': 'secrets', 'MY_PEER_CERTS': 'certs'} for name in d: - d[name] += u'.' + profile + d[name] += profile self.add(name, TYPE_DATA, windowsify(d[name])) - self.add('MY_DATA', TYPE_DATA, 'data' + profile) + self.add('MY_DATA', TYPE_DATA, 'data.dir' + profile) d = {'CACHE_DB': 'cache.db', 'VCARD': 'vcards', 'AVATAR': 'avatars', 'PID_FILE': 'gajim.pid'} for name in d: - d[name] += u'.' + profile + d[name] += profile self.add(name, TYPE_CACHE, windowsify(d[name])) - self.add('MY_CACHE', TYPE_CACHE, 'cache' + profile) + self.add('MY_CACHE', TYPE_CACHE, 'cache.dir' + profile) d = {'CONFIG_FILE': 'config', 'PLUGINS_CONFIG_DIR': 'pluginsconfig', 'MY_CERT': 'localcerts'} for name in d: - d[name] += u'.' + profile + d[name] += profile self.add(name, TYPE_CONFIG, windowsify(d[name])) - self.add('MY_CONFIG', TYPE_CONFIG, 'config' + profile) + self.add('MY_CONFIG', TYPE_CONFIG, 'config.dir' + profile) basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify('data'))) diff -r 127cb0ebcec1 -r caab0e5dfbde src/common/connection.py --- a/src/common/connection.py Mon Sep 05 00:10:50 2016 +0200 +++ b/src/common/connection.py Mon Sep 05 01:43:39 2016 +0200 @@ -515,7 +515,7 @@ subject, type_, msg_iq, xhtml) def log_message(self, jid, msg, forward_from, session, original_message, - subject, type_, xhtml=None): + subject, type_, xhtml=None, additional_data={}): if not forward_from and session and session.is_loggable(): ji = gajim.get_jid_without_resource(jid) if gajim.config.should_log(self.name, ji): @@ -531,7 +531,7 @@ if xhtml and gajim.config.get('log_xhtml_messages'): log_msg = '<body xmlns="%s">%s</body>' % ( nbxmpp.NS_XHTML, xhtml) - gajim.logger.write(kind, jid, log_msg, subject=subject) + gajim.logger.write(kind, jid, log_msg, subject=subject, additional_data=additional_data) except exceptions.PysqliteOperationalError as e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) @@ -2145,13 +2145,13 @@ if isinstance(msg_iq, list): for iq in msg_iq: gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent( - None, conn=self, msg_iq=iq, now=obj.now, automatic_message=obj.automatic_message, + None, conn=self, msg_iq=iq, now=obj.now, automatic_message=obj.automatic_message, additional_data=obj.additional_data, _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, "session":session, "original_message":original_message, "subject":subject, "type_":type_, "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) else: gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent(None, - conn=self, msg_iq=msg_iq, now=obj.now, automatic_message=obj.automatic_message, + conn=self, msg_iq=msg_iq, now=obj.now, automatic_message=obj.automatic_message, additional_data=obj.additional_data, _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, "session":session, "original_message":original_message, "subject":subject, "type_":type_, "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) @@ -2174,7 +2174,7 @@ subject, type_, msg_iq, xhtml, msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate, - automatic_message=obj.automatic_message, msg_id=msg_id)) + automatic_message=obj.automatic_message, msg_id=msg_id, additional_data=obj.additional_data)) if obj.callback: obj.callback(msg_iq, *obj.callback_args) @@ -2185,10 +2185,10 @@ if session is None: session = self.get_or_create_session(j, '') self.log_message(j, msg, forward_from, session, - original_message, subject, type_, xhtml) + original_message, subject, type_, xhtml, obj.additional_data) else: self.log_message(jid, msg, forward_from, session, - original_message, subject, type_, xhtml) + original_message, subject, type_, xhtml, obj.additional_data) cb(msg_id=obj.msg_id, **obj._cb_parameters) @@ -2749,7 +2749,7 @@ gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( None, conn=self, automatic_message=obj.automatic_message, jid=obj.jid, message=obj.message, - correction_msg=obj.correction_msg)) + correction_msg=obj.correction_msg, additional_data=obj.additional_data)) if obj.callback: obj.callback(obj.correction_msg, obj.message) return @@ -2763,7 +2763,7 @@ gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( None, conn=self, msg_iq=msg_iq, automatic_message=obj.automatic_message, - jid=obj.jid, message=obj.message, correction_msg=None)) + jid=obj.jid, message=obj.message, correction_msg=None, additional_data=obj.additional_data)) if obj.callback: obj.callback(msg_iq, obj.message) @@ -2777,7 +2777,7 @@ gajim.nec.push_incoming_event(MessageSentEvent( None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None, automatic_message=obj.automatic_message, - msg_id=obj.msg_id)) + msg_id=obj.msg_id, additional_data=obj.additional_data)) def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): diff -r 127cb0ebcec1 -r caab0e5dfbde src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Sep 05 00:10:50 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Sep 05 01:43:39 2016 +0200 @@ -1025,11 +1025,12 @@ name = 'mam-message-received' base_network_events = [] + def init(self): + self.additional_data = {} + def generate(self): if not self.stanza: return - if not hasattr(self, 'additional_data'): - self.additional_data = {} account = self.conn.name self.msg_ = self.stanza.getTag('message') # use timestamp of archived message, if available and archive timestamp otherwise @@ -1104,15 +1105,15 @@ name = 'message-received' base_network_events = ['raw-message-received'] + def init(self): + self.additional_data = {} + def generate(self): self.conn = self.base_event.conn self.stanza = self.base_event.stanza self.get_id() self.forwarded = False self.sent = False - if not hasattr(self, 'additional_data'): - self.additional_data = {} - account = self.conn.name # check if the message is a roster item exchange (XEP-0144) @@ -1823,9 +1824,9 @@ name = 'stanza-received' base_network_events = [] + def init(self): + self.additional_data = {} def generate(self): - if not hasattr(self, 'additional_data'): - self.additional_data = {} return True class StanzaSentEvent(nec.NetworkIncomingEvent): @@ -2669,6 +2670,7 @@ base_network_events = [] def init(self): + self.additional_data = {} self.message = '' self.keyID = None self.type_ = 'chat' @@ -2715,6 +2717,7 @@ base_network_events = [] def init(self): + self.additional_data = {} self.message = '' self.xhtml = None self.label = None diff -r 127cb0ebcec1 -r caab0e5dfbde src/common/logger.py --- a/src/common/logger.py Mon Sep 05 00:10:50 2016 +0200 +++ b/src/common/logger.py Mon Sep 05 01:43:39 2016 +0200 @@ -142,8 +142,6 @@ # if locked, wait up to 20 sec to unlock # before raise (hopefully should be enough) - print("*****") - print("%s/%s" % (LOG_DB_FOLDER, LOG_DB_FILE)) self.con = sqlite.connect(LOG_DB_FILE, timeout=20.0, isolation_level='IMMEDIATE') os.chdir(back) @@ -1159,7 +1157,7 @@ # usually it hold description and can be send at each connection # so don't store it in logs try: - self.write('gc_msg', obj.fjid, obj.msgtxt, tim=obj.timestamp) + self.write('gc_msg', obj.fjid, obj.msgtxt, tim=obj.timestamp, additional_data=obj.additional_data) # store in memory time of last message logged. # this will also be saved in rooms_last_message_time table # when we quit this muc

1 0

gajim: Some more improvements to gajim's path management
by Gajim 04 Sep '16

04 Sep '16

changeset 127cb0ebcec1 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=127cb0ebcec1 description: Some more improvements to gajim's path management diffstat: src/common/configpaths.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (46 lines): diff -r 6aa48be81fc6 -r 127cb0ebcec1 src/common/configpaths.py --- a/src/common/configpaths.py Mon Sep 05 00:01:29 2016 +0200 +++ b/src/common/configpaths.py Mon Sep 05 00:10:50 2016 +0200 @@ -138,6 +138,9 @@ if root is not None: self.config_root = self.cache_root = self.data_root = root + if len(profile) > 0: + profile = u'.' + profile + d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', @@ -145,26 +148,23 @@ 'RNG_SEED': 'rng_seed', 'SECRETS_FILE': 'secrets', 'MY_PEER_CERTS': 'certs'} for name in d: - if len(profile) > 0: - d[name] += u'.' + profile + d[name] += u'.' + profile self.add(name, TYPE_DATA, windowsify(d[name])) - self.add('MY_DATA', TYPE_DATA, '') + self.add('MY_DATA', TYPE_DATA, 'data' + profile) d = {'CACHE_DB': 'cache.db', 'VCARD': 'vcards', 'AVATAR': 'avatars', 'PID_FILE': 'gajim.pid'} for name in d: - if len(profile) > 0: - d[name] += u'.' + profile + d[name] += u'.' + profile self.add(name, TYPE_CACHE, windowsify(d[name])) - self.add('MY_CACHE', TYPE_CACHE, '') + self.add('MY_CACHE', TYPE_CACHE, 'cache' + profile) d = {'CONFIG_FILE': 'config', 'PLUGINS_CONFIG_DIR': 'pluginsconfig', 'MY_CERT': 'localcerts'} for name in d: - if len(profile) > 0: - d[name] += u'.' + profile + d[name] += u'.' + profile self.add(name, TYPE_CONFIG, windowsify(d[name])) - self.add('MY_CONFIG', TYPE_CONFIG, '') + self.add('MY_CONFIG', TYPE_CONFIG, 'config' + profile) basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify('data')))

1 0

gajim: Honor profile given on commandline for plugin dir and his...
by Gajim 04 Sep '16

04 Sep '16

changeset 6aa48be81fc6 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6aa48be81fc6 description: Honor profile given on commandline for plugin dir and history db and more. Also added new property 'additional_data' to message event objects. Changes to this attribute (a dict) are passed on from event to event and are also written to the history db as json string (reading of those values isn't implemented yet). diffstat: src/common/check_paths.py | 3 +- src/common/configpaths.py | 47 ++++++++++++------------------- src/common/connection_handlers_events.py | 15 ++++++++++ src/common/logger.py | 10 ++++-- src/common/optparser.py | 17 +++++++++++ src/common/resolver.py | 1 - src/gajim.py | 3 +- src/gui_interface.py | 7 ++-- src/history_manager.py | 1 - src/htmltextview.py | 1 - src/notify.py | 8 ++-- src/session.py | 4 +- test/lib/__init__.py | 1 - test/test_pluginmanager.py | 1 - 14 files changed, 69 insertions(+), 50 deletions(-) diffs (truncated from 355 to 300 lines): diff -r f5209cb10665 -r 6aa48be81fc6 src/common/check_paths.py --- a/src/common/check_paths.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/check_paths.py Mon Sep 05 00:01:29 2016 +0200 @@ -72,7 +72,8 @@ kind INTEGER, show INTEGER, message TEXT, - subject TEXT + subject TEXT, + additional_data TEXT DEFAULT '{}' ); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); diff -r f5209cb10665 -r 6aa48be81fc6 src/common/configpaths.py --- a/src/common/configpaths.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/configpaths.py Mon Sep 05 00:01:29 2016 +0200 @@ -134,23 +134,36 @@ for key in self.paths.keys(): yield (key, self[key]) - def init(self, root=None): + def init(self, root=None, profile=''): if root is not None: self.config_root = self.cache_root = self.data_root = root - d = {'MY_DATA': '', 'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', + d = {'LOG_DB': 'logs.db', 'MY_CACERTS': 'cacerts.pem', 'MY_EMOTS': 'emoticons', 'MY_ICONSETS': 'iconsets', 'MY_MOOD_ICONSETS': 'moods', 'MY_ACTIVITY_ICONSETS': 'activities', 'PLUGINS_USER': 'plugins', - 'RNG_SEED': 'rng_seed'} + 'RNG_SEED': 'rng_seed', + 'SECRETS_FILE': 'secrets', 'MY_PEER_CERTS': 'certs'} for name in d: + if len(profile) > 0: + d[name] += u'.' + profile self.add(name, TYPE_DATA, windowsify(d[name])) + self.add('MY_DATA', TYPE_DATA, '') - d = {'MY_CACHE': '', 'CACHE_DB': 'cache.db', 'VCARD': 'vcards', - 'AVATAR': 'avatars'} + d = {'CACHE_DB': 'cache.db', 'VCARD': 'vcards', + 'AVATAR': 'avatars', + 'PID_FILE': 'gajim.pid'} for name in d: + if len(profile) > 0: + d[name] += u'.' + profile self.add(name, TYPE_CACHE, windowsify(d[name])) + self.add('MY_CACHE', TYPE_CACHE, '') + d = {'CONFIG_FILE': 'config', 'PLUGINS_CONFIG_DIR': 'pluginsconfig', 'MY_CERT': 'localcerts'} + for name in d: + if len(profile) > 0: + d[name] += u'.' + profile + self.add(name, TYPE_CONFIG, windowsify(d[name])) self.add('MY_CONFIG', TYPE_CONFIG, '') basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) @@ -172,28 +185,4 @@ except (ImportError, AttributeError): pass - def init_profile(self, profile=''): - conffile = windowsify('config') - pidfile = windowsify('gajim') - secretsfile = windowsify('secrets') - pluginsconfdir = windowsify('pluginsconfig') - certsdir = windowsify(u'certs') - localcertsdir = windowsify(u'localcerts') - - if len(profile) > 0: - conffile += '.' + profile - pidfile += '.' + profile - secretsfile += '.' + profile - pluginsconfdir += '.' + profile - certsdir += u'.' + profile - localcertsdir += u'.' + profile - - pidfile += '.pid' - self.add('CONFIG_FILE', TYPE_CONFIG, conffile) - self.add('PID_FILE', TYPE_CACHE, pidfile) - self.add('SECRETS_FILE', TYPE_DATA, secretsfile) - self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) - self.add('MY_PEER_CERTS', TYPE_DATA, certsdir) - self.add('MY_CERT', TYPE_CONFIG, localcertsdir) - gajimpaths = ConfigPaths() diff -r f5209cb10665 -r 6aa48be81fc6 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/connection_handlers_events.py Mon Sep 05 00:01:29 2016 +0200 @@ -1028,6 +1028,8 @@ def generate(self): if not self.stanza: return + if not hasattr(self, 'additional_data'): + self.additional_data = {} account = self.conn.name self.msg_ = self.stanza.getTag('message') # use timestamp of archived message, if available and archive timestamp otherwise @@ -1066,6 +1068,8 @@ def generate(self): self.nick = None msg_ = self.msg_obj.msg_ + if not hasattr(self, 'additional_data'): + self.additional_data = self.msg_obj.additional_data self.with_ = self.msg_obj.with_ self.direction = self.msg_obj.direction self.tim = self.msg_obj.tim @@ -1106,6 +1110,8 @@ self.get_id() self.forwarded = False self.sent = False + if not hasattr(self, 'additional_data'): + self.additional_data = {} account = self.conn.name @@ -1384,6 +1390,8 @@ def generate(self): self.stanza = self.msg_obj.stanza + if not hasattr(self, 'additional_data'): + self.additional_data = self.msg_obj.additional_data self.id_ = self.msg_obj.id_ self.jid = self.msg_obj.jid self.fjid = self.msg_obj.fjid @@ -1491,6 +1499,8 @@ def generate(self): self.stanza = self.msg_obj.stanza + if not hasattr(self, 'additional_data'): + self.additional_data = self.msg_obj.additional_data self.fjid = self.msg_obj.fjid self.msgtxt = self.msg_obj.msgtxt self.jid = self.msg_obj.jid @@ -1812,6 +1822,11 @@ class StanzaReceivedEvent(nec.NetworkIncomingEvent): name = 'stanza-received' base_network_events = [] + + def generate(self): + if not hasattr(self, 'additional_data'): + self.additional_data = {} + return True class StanzaSentEvent(nec.NetworkIncomingEvent): name = 'stanza-sent' diff -r f5209cb10665 -r 6aa48be81fc6 src/common/logger.py --- a/src/common/logger.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/logger.py Mon Sep 05 00:01:29 2016 +0200 @@ -32,6 +32,7 @@ import sys import time import datetime +import json from gzip import GzipFile from io import BytesIO from gi.repository import GLib @@ -141,6 +142,8 @@ # if locked, wait up to 20 sec to unlock # before raise (hopefully should be enough) + print("*****") + print("%s/%s" % (LOG_DB_FOLDER, LOG_DB_FILE)) self.con = sqlite.connect(LOG_DB_FILE, timeout=20.0, isolation_level='IMMEDIATE') os.chdir(back) @@ -412,7 +415,7 @@ def commit_to_db(self, values, write_unread=False): sql = '''INSERT INTO logs (jid_id, contact_name, time, kind, show, - message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)''' + message, subject, additional_data) VALUES (?, ?, ?, ?, ?, ?, ?, ?)''' try: self.cur.execute(sql, values) except sqlite.OperationalError as e: @@ -495,7 +498,7 @@ all_messages.append(results[0] + (shown,)) return all_messages - def write(self, kind, jid, message=None, show=None, tim=None, subject=None): + def write(self, kind, jid, message=None, show=None, tim=None, subject=None, additional_data={}): """ Write a row (status, gcstatus, message etc) to logs database @@ -517,6 +520,7 @@ # then it holds status message message_col = message subject_col = subject + additional_data_col = json.dumps(additional_data) if tim: time_col = int(float(time.mktime(tim))) else: @@ -576,7 +580,7 @@ return values = (jid_id, contact_name_col, time_col, kind_col, show_col, - message_col, subject_col) + message_col, subject_col, additional_data_col) return self.commit_to_db(values, write_unread) def get_last_conversation_lines(self, jid, restore_how_many_rows, diff -r f5209cb10665 -r 6aa48be81fc6 src/common/optparser.py --- a/src/common/optparser.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/optparser.py Mon Sep 05 00:01:29 2016 +0200 @@ -945,4 +945,21 @@ gajim.config.set('video_input_device', 'autovideosrc') if self.old_values['video_input_device'] == 'videotestsrc is-live=true ! video/x-raw-yuv,framerate=10/1': gajim.config.set('video_input_device', 'videotestsrc is-live=true ! video/x-raw,framerate=10/1') + + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE logs ADD COLUMN 'additional_data' TEXT DEFAULT '{}'; + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.16.10.1') diff -r f5209cb10665 -r 6aa48be81fc6 src/common/resolver.py --- a/src/common/resolver.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/common/resolver.py Mon Sep 05 00:01:29 2016 +0200 @@ -28,7 +28,6 @@ from common import i18n import common.configpaths common.configpaths.gajimpaths.init(None) - common.configpaths.gajimpaths.init_profile() from common import helpers from nbxmpp.idlequeue import IdleCommand diff -r f5209cb10665 -r 6aa48be81fc6 src/gajim.py --- a/src/gajim.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/gajim.py Mon Sep 05 00:01:29 2016 +0200 @@ -178,9 +178,8 @@ del parseOpts import common.configpaths -common.configpaths.gajimpaths.init(config_path) +common.configpaths.gajimpaths.init(config_path, profile) del config_path -common.configpaths.gajimpaths.init_profile(profile) del profile if os.name == 'nt': diff -r f5209cb10665 -r 6aa48be81fc6 src/gui_interface.py --- a/src/gui_interface.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/gui_interface.py Mon Sep 05 00:01:29 2016 +0200 @@ -2528,13 +2528,12 @@ want_type=True) if pixbuf is None: return - extension = '.' + typ if typ not in ('jpeg', 'png'): - gajim.log.debug('gtkpixbuf cannot save other than jpeg and '\ - 'png formats. saving %s\'avatar as png file (originaly %s)'\ + gajim.log.info('gtkpixbuf cannot save other than jpeg and '\ + 'png formats. saving \'%s\' avatar as png file (originaly: %s)'\ % (jid, typ)) typ = 'png' - extension = '.png' + extension = '.' + typ path_to_original_file = path_to_file + extension try: pixbuf.savev(path_to_original_file, typ, [], []) diff -r f5209cb10665 -r 6aa48be81fc6 src/history_manager.py --- a/src/history_manager.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/history_manager.py Mon Sep 05 00:01:29 2016 +0200 @@ -91,7 +91,6 @@ import common.configpaths common.configpaths.gajimpaths.init(config_path) del config_path -common.configpaths.gajimpaths.init_profile() from common import exceptions from common import gajim import gtkgui_helpers diff -r f5209cb10665 -r 6aa48be81fc6 src/htmltextview.py --- a/src/htmltextview.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/htmltextview.py Mon Sep 05 00:01:29 2016 +0200 @@ -50,7 +50,6 @@ if __name__ == '__main__': from common import i18n import common.configpaths - common.configpaths.gajimpaths.init_profile() common.configpaths.gajimpaths.init(None) import gtkgui_helpers from common import gajim diff -r f5209cb10665 -r 6aa48be81fc6 src/notify.py --- a/src/notify.py Fri Sep 02 13:38:56 2016 -0700 +++ b/src/notify.py Mon Sep 05 00:01:29 2016 +0200 @@ -121,10 +121,10 @@ notification.set_category(event_type)

1 0

gajim-plugins: added missing png files back (must have been lost...
by Gajim Plugins 04 Sep '16

04 Sep '16

changeset 0f2217962d18 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=0f2217962d18 description: added missing png files back (must have been lost in the py2 to py3 conversion process) diffstat: httpupload/httpupload.png | Bin httpupload/httpupload.py | 1 - httpupload/image.png | Bin httpupload/manifest.ini | 2 +- 4 files changed, 1 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 1b3448308794 -r 0f2217962d18 httpupload/httpupload.png Binary file httpupload/httpupload.png has changed diff -r 1b3448308794 -r 0f2217962d18 httpupload/httpupload.py --- a/httpupload/httpupload.py Fri Sep 02 22:40:47 2016 +0200 +++ b/httpupload/httpupload.py Sun Sep 04 23:55:49 2016 +0200 @@ -127,7 +127,6 @@ # maybe don't delete this and detect vanished upload components when actually trying to upload something log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] - #pass # query info at most every 60 seconds in case something goes wrong if ((not chat_control.account in last_info_query or diff -r 1b3448308794 -r 0f2217962d18 httpupload/image.png Binary file httpupload/image.png has changed diff -r 1b3448308794 -r 0f2217962d18 httpupload/manifest.ini --- a/httpupload/manifest.ini Fri Sep 02 22:40:47 2016 +0200 +++ b/httpupload/manifest.ini Sun Sep 04 23:55:49 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.5.0 +version: 0.5.1 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim-plugins: Make plugin_installer more robust to filepath lay...
by Gajim Plugins 04 Sep '16

04 Sep '16

changeset fb518dfcbc82 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=fb518dfcbc82 description: Make plugin_installer more robust to filepath layout changes diffstat: plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 0f2217962d18 -r fb518dfcbc82 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Sun Sep 04 23:55:49 2016 +0200 +++ b/plugin_installer/manifest.ini Sun Sep 04 23:56:22 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.13.1 +version: 0.14 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 0f2217962d18 -r fb518dfcbc82 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Sep 04 23:55:49 2016 +0200 +++ b/plugin_installer/plugin_installer.py Sun Sep 04 23:56:22 2016 +0200 @@ -602,7 +602,7 @@ # downloading zip file GLib.idle_add(self.progressbar.set_text, _('Downloading "%s"') % filename) - full_filename = os.path.join(local_dir, 'plugins', filename) + full_filename = os.path.join(user_dir, filename) self.buffer_ = io.BytesIO() try: self.ftp.retrbinary('RETR %s' % filename, self.handleDownload) @@ -610,7 +610,7 @@ print (str(e)) with zipfile.ZipFile(self.buffer_) as zip_file: - zip_file.extractall(os.path.join(local_dir, 'plugins')) + zip_file.extractall(os.path.join(user_dir)) self.ftp.quit() GLib.idle_add(self.window.emit, 'plugin_downloaded', self.remote_dirs)

1 0

gajim: fix authors list
by Gajim 04 Sep '16

04 Sep '16

changeset 3e5acf1f7847 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3e5acf1f7847 description: fix authors list diffstat: AUTHORS | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 04723bd1dd57 -r 3e5acf1f7847 AUTHORS --- a/AUTHORS Fri Sep 02 21:55:23 2016 +0200 +++ b/AUTHORS Sun Sep 04 14:22:06 2016 +0200 @@ -1,17 +1,17 @@ CURRENT DEVELOPERS: -Alexander Cherniuk (ts33kr AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Jonathan Schleifer (js-gajim AT webkeks.org) PAST DEVELOPERS: Stefan Bethge (stefan AT lanpartei.de) +Alexander Cherniuk (ts33kr AT gmail.com) Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) Nikos Kouremenos (kourem AT gmail.com) Julien Pivotto (roidelapluie AT gmail.com) +Jonathan Schleifer (js-gajim AT webkeks.org) Travis Shirk (travis AT pobox.com) Brendan Taylor (whateley AT gmail.com) Jean-Marie Traissard (jim AT lapin.org)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2016