Commits July 2015

commits@gajim.org

1 participants
101 discussions

gajim: remove stock usage
by Gajim 25 Jul '15

25 Jul '15

changeset f21a251c01b5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f21a251c01b5 description: remove stock usage diffstat: data/gui/filetransfers.ui | 25 ++++++++++++++++++------- data/gui/roster_window.ui | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diffs (84 lines): diff -r cee42c275cc2 -r f21a251c01b5 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Sat Jul 25 22:03:24 2015 +0200 +++ b/data/gui/filetransfers.ui Sat Jul 25 22:03:48 2015 +0200 @@ -56,12 +56,22 @@ <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-clear</property> + <property name="icon_name">gtk-clear</property> </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-media-pause</property> + <property name="icon_name">media-playback-pause</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-cancel</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">gtk-close</property> </object> <object class="GtkWindow" id="file_transfers_window"> <property name="can_focus">False</property> @@ -86,7 +96,6 @@ <object class="GtkTreeView" id="transfers_list"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="rules_hint">True</property> <property name="enable_search">False</property> <signal name="button-press-event" handler="on_transfers_list_button_press_event" swapped="no"/> <signal name="button-release-event" handler="on_transfers_list_button_release_event" swapped="no"/> @@ -163,14 +172,15 @@ </child> <child> <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> + <property name="label">_Cancel</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> - <property name="use_stock">True</property> + <property name="image">image3</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> <child internal-child="accessible"> <object class="AtkObject" id="cancel_button-atkobject"> @@ -187,14 +197,15 @@ </child> <child> <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Hides the window</property> - <property name="use_stock">True</property> + <property name="image">image4</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> </object> <packing> diff -r cee42c275cc2 -r f21a251c01b5 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Sat Jul 25 22:03:24 2015 +0200 +++ b/data/gui/roster_window.ui Sat Jul 25 22:03:48 2015 +0200 @@ -341,7 +341,7 @@ <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="editable">False</property> - <property name="primary_icon_stock">gtk-clear</property> + <property name="primary_icon_name">gtk-clear</property> <signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/> <signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/> </object>

1 0

gajim: make completion work
by Gajim 25 Jul '15

25 Jul '15

changeset 88d74b9f4ea1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=88d74b9f4ea1 description: make completion work diffstat: src/chat_control.py | 167 ++++++++++------------------------------------ src/groupchat_control.py | 46 +++--------- src/message_textview.py | 75 --------------------- src/message_window.py | 21 ----- 4 files changed, 50 insertions(+), 259 deletions(-) diffs (truncated from 421 to 300 lines): diff -r 1839ecb719cc -r 88d74b9f4ea1 src/chat_control.py --- a/src/chat_control.py Fri Jul 24 21:49:10 2015 +0200 +++ b/src/chat_control.py Sat Jul 25 21:40:51 2015 +0200 @@ -216,59 +216,6 @@ return self.print_conversation(_('Error.'), 'status') - def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): - """ - Derives types SHOULD implement this, rather than connection to the even - itself - """ - event = Gdk.Event(Gdk.EventType.KEY_PRESS) - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 - - _buffer = widget.get_buffer() - start, end = _buffer.get_bounds() - - if event.keyval -- Gdk.KEY_Tab: - position = _buffer.get_insert() - end = _buffer.get_iter_at_mark(position) - - text = _buffer.get_text(start, end, False) - - splitted = text.split() - - if (text.startswith(self.COMMAND_PREFIX) and not - text.startswith(self.COMMAND_PREFIX * 2) and len(splitted) == 1): - - text = splitted[0] - bare = text.lstrip(self.COMMAND_PREFIX) - - if len(text) == 1: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - self.command_hits.append(name) - else: - if (self.last_key_tabs and self.command_hits and - self.command_hits[0].startswith(bare)): - self.command_hits.append(self.command_hits.pop(0)) - else: - self.command_hits = [] - for command in self.list_commands(): - for name in command.names: - if name.startswith(bare): - self.command_hits.append(name) - - if self.command_hits: - _buffer.delete(start, end) - _buffer.insert_at_cursor(self.COMMAND_PREFIX + self.command_hits[0] + ' ') - self.last_key_tabs = True - - return True - - self.last_key_tabs = False - def status_url_clicked(self, widget, url): helpers.launch_browser_mailer('url', url) @@ -401,9 +348,6 @@ # add MessageTextView to UI and connect signals self.msg_scrolledwindow = self.xml.get_object('message_scrolledwindow') self.msg_textview = MessageTextView() - id_ = self.msg_textview.connect('mykeypress', - self._on_message_textview_mykeypress_event) - self.handlers[id_] = self.msg_textview self.msg_scrolledwindow.add(self.msg_textview) id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) @@ -708,10 +652,43 @@ if event.keyval == Gdk.KEY_Tab: # CTRL + TAB self.parent_win.move_to_next_unread_tab(True) return True -################################################################################ - # temporary solution instead Gtk.binding_entry_add_signal + message_buffer = self.msg_textview.get_buffer() event_state = event.get_state() + if event.keyval == Gdk.KEY_Tab: + start, end = message_buffer.get_bounds() + position = message_buffer.get_insert() + end = message_buffer.get_iter_at_mark(position) + text = message_buffer.get_text(start, end, False) + splitted = text.split() + if (text.startswith(self.COMMAND_PREFIX) and not + text.startswith(self.COMMAND_PREFIX * 2) and len(splitted) == 1): + text = splitted[0] + bare = text.lstrip(self.COMMAND_PREFIX) + if len(text) == 1: + self.command_hits = [] + for command in self.list_commands(): + for name in command.names: + self.command_hits.append(name) + else: + if (self.last_key_tabs and self.command_hits and + self.command_hits[0].startswith(bare)): + self.command_hits.append(self.command_hits.pop(0)) + else: + self.command_hits = [] + for command in self.list_commands(): + for name in command.names: + if name.startswith(bare): + self.command_hits.append(name) + + if self.command_hits: + message_buffer.delete(start, end) + message_buffer.insert_at_cursor(self.COMMAND_PREFIX + \ + self.command_hits[0] + ' ') + self.last_key_tabs = True + return True + if self.widget_name != 'groupchat_control': + self.last_key_tabs = False if event.keyval == Gdk.KEY_Up: if event_state & Gdk.ModifierType.CONTROL_MASK: if event_state & Gdk.ModifierType.SHIFT_MASK: # Ctrl+Shift+UP @@ -764,81 +741,9 @@ if event_state & Gdk.ModifierType.CONTROL_MASK: self.msg_textview.undo() return True -################################################################################ + return False - def _on_message_textview_mykeypress_event(self, widget, event_keyval, - event_keymod): - """ - When a key is pressed: if enter is pressed without the shift key, message - (if not empty) is sent and printed in the conversation - """ - # NOTE: handles mykeypress which is custom signal connected to this - # CB in new_tab(). for this singal see message_textview.py - message_textview = widget - message_buffer = message_textview.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() - message = message_buffer.get_text(start_iter, end_iter, False) - xhtml = self.msg_textview.get_xhtml() - - # construct event instance from binding - event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - if event.keyval == Gdk.KEY_Up: - if event.get_state() == Gdk.ModifierType.CONTROL_MASK: # Ctrl+UP - self.scroll_messages('up', message_buffer, 'sent') - # Ctrl+Shift+UP - elif event.get_state() == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK): - self.scroll_messages('up', message_buffer, 'received') - elif event.keyval == Gdk.KEY_Down: - if event.get_state() == Gdk.ModifierType.CONTROL_MASK: # Ctrl+Down - self.scroll_messages('down', message_buffer, 'sent') - # Ctrl+Shift+Down - elif event.get_state() == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK): - self.scroll_messages('down', message_buffer, 'received') - elif event.keyval == Gdk.KEY_Return or \ - event.keyval == Gdk.KEY_KP_Enter: # ENTER - # NOTE: SHIFT + ENTER is not needed to be emulated as it is not - # binding at all (textview's default action is newline) - - if gajim.config.get('send_on_ctrl_enter'): - # here, we emulate GTK default action on ENTER (add new line) - # normally I would add in keypress but it gets way to complex - # to get instant result on changing this advanced setting - if event.get_state() == 0: # no ctrl, no shift just ENTER add newline - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - elif event.get_state() & Gdk.ModifierType.CONTROL_MASK: # CTRL + ENTER - send_message = True - else: # send on Enter, do newline on Ctrl Enter - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: # Ctrl + ENTER - end_iter = message_buffer.get_end_iter() - message_buffer.insert_at_cursor('\n') - send_message = False - else: # ENTER - send_message = True - - if gajim.connections[self.account].connected < 2 and send_message: - # we are not connected - dialogs.ErrorDialog(_('A connection is not available'), - _('Your message can not be sent until you are connected.'), - transient_for=self.parent_win.window) - send_message = False - - if send_message: - self.send_message(message, xhtml=xhtml) # send the message - elif event.keyval == Gdk.KEY_z: # CTRL+z - if event.get_state() & Gdk.ModifierType.CONTROL_MASK: - self.msg_textview.undo() - else: - # Give the control itself a chance to process - self.handle_message_textview_mykey_press(widget, event_keyval, - event_keymod) - def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): """ diff -r 1839ecb719cc -r 88d74b9f4ea1 src/groupchat_control.py --- a/src/groupchat_control.py Fri Jul 24 21:49:10 2015 +0200 +++ b/src/groupchat_control.py Sat Jul 25 21:40:51 2015 +0200 @@ -2290,39 +2290,21 @@ self.print_conversation(_('%(jid)s has been invited in this room') % { 'jid': contact_jid}, graphics=False) - def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): - # NOTE: handles mykeypress which is custom signal connected to this - # CB in new_room(). for this singal see message_textview.py - - if not widget.get_sensitive(): - # Textview is not sensitive, don't handle keypress - return - # construct event instance from binding - event = Gdk.Event(Gdk.EventType.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - message_buffer = widget.get_buffer() - start_iter, end_iter = message_buffer.get_bounds() + def _on_message_textview_key_press_event(self, widget, event): + res = ChatControlBase._on_message_textview_key_press_event(self, widget, + event) + if res: + return True if event.keyval == Gdk.KEY_Tab: # TAB + message_buffer = widget.get_buffer() + start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() end_iter = message_buffer.get_iter_at_mark(cursor_position) - text = message_buffer.get_text(start_iter, end_iter, False).decode( - 'utf-8') + text = message_buffer.get_text(start_iter, end_iter, False) splitted_text = text.split() - # HACK: Not the best soltution. - if (text.startswith(self.COMMAND_PREFIX) and not - text.startswith(self.COMMAND_PREFIX * 2) and \ - len(splitted_text) == 1): - return super(GroupchatControl, self).\ - handle_message_textview_mykey_press(widget, event_keyval, - event_keymod) - # nick completion # check if tab is pressed with empty message if len(splitted_text): # if there are any words @@ -2340,7 +2322,7 @@ with_refer_to_nick_char = True after_nick_len = len(gc_refer_to_nick_char + ' ') if len(self.nick_hits) and self.last_key_tabs and \ - text[:-after_nick_len].endswith(self.nick_hits[0]): + text[:-after_nick_len].endswith(self.nick_hits[0]): # we should cycle # Previous nick in list may had a space inside, so we check text # and not splitted_text and store it into 'begin' var @@ -2349,7 +2331,7 @@ else: self.nick_hits = [] # clear the hit list list_nick = gajim.contacts.get_nick_list(self.account, - self.room_jid) + self.room_jid) list_nick.sort(key=str.lower) # case-insensitive sort if begin == '': # empty message, show lasts nicks that highlighted us first @@ -2362,7 +2344,7 @@ for nick in list_nick: fjid = self.room_jid + '/' + nick if nick.lower().startswith(begin.lower()) and not \ - helpers.jid_is_blocked(self.account, fjid): + helpers.jid_is_blocked(self.account, fjid): # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits): @@ -2374,17 +2356,17 @@ add = ' ' start_iter = end_iter.copy() if self.last_key_tabs and with_refer_to_nick_char or (text and \ - text[-1] == ' '): + text[-1] == ' '): # have to accomodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char! start_iter.backward_chars(len(begin) + len(add)) elif self.last_key_tabs and not gajim.config.get( - 'shell_like_completion'): + 'shell_like_completion'): # have to accomodate for the added space from last # completion start_iter.backward_chars(len(begin) + \ - len(gc_refer_to_nick_char)) + len(gc_refer_to_nick_char)) else: start_iter.backward_chars(len(begin))

1 0

gajim-website: update website for 0.16.2
by Gajim Website 25 Jul '15

25 Jul '15

changeset fc15a840c235 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=fc15a840c235 description: update website for 0.16.2 diffstat: downloads.php | 2 +- index.php | 28 ++++++++++++------ locale/ar_AE/LC_MESSAGES/msg.po | 61 ++++++++++++++++++++++------------------ locale/bg_BG/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/de_DE/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/eo/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/es_ES/LC_MESSAGES/msg.po | 61 ++++++++++++++++++++++------------------ locale/fr_FR/LC_MESSAGES/msg.po | 59 +++++++++++++++++++++------------------ locale/he_IL/LC_MESSAGES/msg.po | 52 +++++++++++++++++++--------------- locale/hu_HU/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/it_IT/LC_MESSAGES/msg.po | 61 ++++++++++++++++++++++------------------ locale/pl_PL/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/pt_BR/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- locale/ru_RU/LC_MESSAGES/msg.po | 45 ++++++++++++++++------------- msg.pot | 56 +++++++++++++++++++++---------------- 15 files changed, 387 insertions(+), 308 deletions(-) diffs (truncated from 1585 to 300 lines): diff -r dc44ec9bfe09 -r fc15a840c235 downloads.php --- a/downloads.php Thu Jun 04 09:37:28 2015 +0200 +++ b/downloads.php Sat Jul 25 14:16:44 2015 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.16"; -$last_version = "0.16.1"; +$last_version = "0.16.2"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.16-rc2"); diff -r dc44ec9bfe09 -r fc15a840c235 index.php --- a/index.php Thu Jun 04 09:37:28 2015 +0200 +++ b/index.php Sat Jul 25 14:16:44 2015 +0200 @@ -50,37 +50,47 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.16.1"), - 1 => sprintf(_("Gajim %s is here!"), "0.16"), + 0 => sprintf(_("Gajim %s is here!"), "0.16.2"), + 1 => sprintf(_("Gajim %s is here!"), "0.16.1"), + 2 => sprintf(_("Gajim %s is here!"), "0.16"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("28 February 2015"), - 1 => _("04 October 2014"), + 0 => _("24 July 2015"), + 1 => _("28 February 2015"), + 2 => _("04 October 2014"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.16.1"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.16"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.16.2"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.16.1"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.16"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.16"), - 1 => sprintf(_("What's new since %s:"), "0.15.4"), + 0 => sprintf(_("What's new since %s:"), "0.16.1"), + 1 => sprintf(_("What's new since %s:"), "0.16"), + 2 => sprintf(_("What's new since %s:"), "0.15.4"), ); $array_news_items[0] = array( + 0 => _("Improve Zeroconf under windows and with IPv6"), + 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.2/ChangeLog\">"._("Full ChangeLog")."</a> ", + 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.2\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Message Archive Management") . " (<a href=\"http://xmpp.org/extensions/xep-0313.html\">XEP-0313</a>)", 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.1/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Improve File transfer"), 1 => _("Improve security"), 2 => _("Improve audio / video calls"), diff -r dc44ec9bfe09 -r fc15a840c235 locale/ar_AE/LC_MESSAGES/msg.po --- a/locale/ar_AE/LC_MESSAGES/msg.po Thu Jun 04 09:37:28 2015 +0200 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Sat Jul 25 14:16:44 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-28 22:57+0100\n" +"POT-Creation-Date: 2015-07-25 14:15+0200\n" "PO-Revision-Date: 2014-06-02 01:08+0300\n" "Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" "Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" @@ -626,64 +626,73 @@ msgid "NEWS" msgstr "الاخبار" -#: index.php:53 index.php:54 +#: index.php:53 index.php:54 index.php:55 #, c-format msgid "Gajim %s is here!" msgstr "كاجيم %s هنا!" -#: index.php:60 +#: index.php:61 +#, fuzzy +msgid "24 July 2015" +msgstr "25 ماي 2013" + +#: index.php:62 msgid "28 February 2015" msgstr "" -#: index.php:61 +#: index.php:63 #, fuzzy msgid "04 October 2014" msgstr "30 اوكتوبر 2012" -#: index.php:65 index.php:66 +#: index.php:67 index.php:68 index.php:69 #, c-format msgid "Version %s of Gajim has been released." msgstr "النسخة %s من كاجيم تم اصدارها." -#: index.php:73 index.php:74 +#: index.php:76 index.php:77 index.php:78 #, c-format msgid "What's new since %s:" msgstr "الجديد منذ %s:" -#: index.php:78 +#: index.php:82 +msgid "Improve Zeroconf under windows and with IPv6" +msgstr "" + +#: index.php:83 index.php:89 index.php:99 +msgid "Full ChangeLog" +msgstr "سجل التغيير الكامل" + +#: index.php:83 index.php:89 index.php:99 +msgid "Full changelog, see" +msgstr "سجل التغيير الكامل, شاهد " + +#: index.php:84 index.php:90 index.php:100 +msgid "List of fixed bugs" +msgstr "قائمة المشاكل التي تم اصلاحها" + +#: index.php:88 #, fuzzy msgid "Message Archive Management" msgstr "ارشفة الرسالة" -#: index.php:79 index.php:89 -msgid "Full ChangeLog" -msgstr "سجل التغيير الكامل" - -#: index.php:79 index.php:89 -msgid "Full changelog, see" -msgstr "سجل التغيير الكامل, شاهد " - -#: index.php:80 index.php:90 -msgid "List of fixed bugs" -msgstr "قائمة المشاكل التي تم اصلاحها" - -#: index.php:84 +#: index.php:94 msgid "Improve File transfer" msgstr "تطوير ارسال ملفات" -#: index.php:85 +#: index.php:95 msgid "Improve security" msgstr "تطوير الامن" -#: index.php:86 +#: index.php:96 msgid "Improve audio / video calls" msgstr "تطوير الاتصال الصوتي و المرئي" -#: index.php:87 +#: index.php:97 msgid "Last message correction" msgstr "تصحيح اخر رسالة" -#: index.php:88 +#: index.php:98 msgid "Jingle Audio under windows" msgstr " دعم صوت Jingle للوندوز" @@ -717,10 +726,6 @@ #~ msgid "Beta-release of Gajim %s" #~ msgstr "نسخة البيتا الخاصة ب كاجيم %s" -#, fuzzy -#~ msgid "02 July 2014" -#~ msgstr "25 ماي 2013" - #~ msgid "15 March 2014" #~ msgstr "15 مارس 2014" diff -r dc44ec9bfe09 -r fc15a840c235 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Thu Jun 04 09:37:28 2015 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sat Jul 25 14:16:44 2015 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-28 22:57+0100\n" +"POT-Creation-Date: 2015-07-25 14:15+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -652,67 +652,76 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 index.php:54 +#: index.php:53 index.php:54 index.php:55 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:60 +#: index.php:61 +#, fuzzy +msgid "24 July 2015" +msgstr "18 февруари 2007 г." + +#: index.php:62 #, fuzzy msgid "28 February 2015" msgstr "7 февруари 2007 г." -#: index.php:61 +#: index.php:63 #, fuzzy msgid "04 October 2014" msgstr "19 декември 2006 г." -#: index.php:65 index.php:66 +#: index.php:67 index.php:68 index.php:69 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:73 index.php:74 +#: index.php:76 index.php:77 index.php:78 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:78 -msgid "Message Archive Management" +#: index.php:82 +msgid "Improve Zeroconf under windows and with IPv6" msgstr "" -#: index.php:79 index.php:89 +#: index.php:83 index.php:89 index.php:99 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:79 index.php:89 +#: index.php:83 index.php:89 index.php:99 #, fuzzy msgid "Full changelog, see" msgstr "Пълен дневник на промените" -#: index.php:80 index.php:90 +#: index.php:84 index.php:90 index.php:100 msgid "List of fixed bugs" msgstr "" -#: index.php:84 +#: index.php:88 +msgid "Message Archive Management" +msgstr "" + +#: index.php:94 #, fuzzy msgid "Improve File transfer" msgstr "Инсталатор за „Уиндоус“" -#: index.php:85 +#: index.php:95 #, fuzzy msgid "Improve security" msgstr "Инсталатор за „Уиндоус“" -#: index.php:86 +#: index.php:96 msgid "Improve audio / video calls" msgstr "" -#: index.php:87 +#: index.php:97 msgid "Last message correction" msgstr "" -#: index.php:88 +#: index.php:98 msgid "Jingle Audio under windows" msgstr "" @@ -749,10 +758,6 @@ #~ msgstr "Предварително издание на Gajim 0.11.1" #, fuzzy

1 0

gajim-plugins: and a message size limit to anti-spam plugin
by Gajim Plugins 24 Jul '15

24 Jul '15

changeset de8e9bc4f357 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=de8e9bc4f357 description: and a message size limit to anti-spam plugin diffstat: anti_spam/anti_spam.py | 22 +++++++++++++++++- anti_spam/config_dialog.ui | 55 +++++++++++++++++++++++++++++++++++++++++---- anti_spam/manifest.ini | 2 +- 3 files changed, 72 insertions(+), 7 deletions(-) diffs (192 lines): diff -r 9fa9ce820249 -r de8e9bc4f357 anti_spam/anti_spam.py --- a/anti_spam/anti_spam.py Sat Jun 20 21:26:53 2015 +0200 +++ b/anti_spam/anti_spam.py Fri Jul 24 23:35:55 2015 +0200 @@ -44,6 +44,8 @@ 'atom-entry-received': (ged.POSTCORE, self._nec_atom_entry_received), 'message-received': (ged.PRECORE, + self._nec_message_received_received), + 'decrypted-message-received': (ged.PRECORE, self._nec_decrypted_message_received_received), 'subscribe-presence-received': (ged.POSTCORE, self._nec_subscribe_presence_received), @@ -54,6 +56,7 @@ 'disable_xhtml_muc': (False, ''), 'disable_xhtml_pm': (False, ''), 'block_subscription_requests': (False, ''), + 'msgtxt_limit': (-1, ''), } @log_calls('AntiSpamPlugin') @@ -63,7 +66,7 @@ return True @log_calls('AntiSpamPlugin') - def _nec_decrypted_message_received_received(self, obj): + def _nec_message_received_received(self, obj): if self.config['disable_xhtml_muc'] and obj.mtype == 'groupchat': self.remove_xhtml(obj) if self.config['disable_xhtml_pm'] and obj.gc_control and \ @@ -72,6 +75,15 @@ return False @log_calls('AntiSpamPlugin') + def _nec_decrypted_message_received_received(self, obj): + if not obj.msgtxt: + return False + limit = self.config['msgtxt_limit'] + if limit > -1 and len(obj.msgtxt) > limit: + return True + return False + + @log_calls('AntiSpamPlugin') def _nec_subscribe_presence_received(self, obj): if self.config['block_subscription_requests'] and \ not gajim.contacts.get_contacts(obj.conn.name, obj.jid): @@ -109,6 +121,8 @@ widget.set_active(self.plugin.config['disable_xhtml_pm']) widget = self.xml.get_object('block_subscription_requests_checkbutton') widget.set_active(self.plugin.config['block_subscription_requests']) + widget = self.xml.get_object('message_size_limit_entry') + widget.set_text(str(self.plugin.config['msgtxt_limit'])) def on_block_pubsub_messages_checkbutton_toggled(self, button): self.plugin.config['block_pubsub_messages'] = button.get_active() @@ -121,3 +135,9 @@ def on_block_subscription_requests_checkbutton_toggled(self, button): self.plugin.config['block_subscription_requests'] = button.get_active() + + def on_message_size_limit_entry_changed(self, entry): + try: + self.plugin.config['msgtxt_limit'] = int(entry.get_text()) + except Exception: + pass diff -r 9fa9ce820249 -r de8e9bc4f357 anti_spam/config_dialog.ui --- a/anti_spam/config_dialog.ui Sat Jun 20 21:26:53 2015 +0200 +++ b/anti_spam/config_dialog.ui Fri Jul 24 23:35:55 2015 +0200 @@ -3,11 +3,12 @@ <requires lib="gtk+" version="2.16"/>  <object class="GtkWindow" id="window1"> + <property name="can_focus">False</property> <child> <object class="GtkVBox" id="anti_spam_config_vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">9</property> - <property name="orientation">vertical</property> <property name="spacing">4</property> <child> <object class="GtkCheckButton" id="block_pubsub_messages_checkbutton"> @@ -16,11 +17,13 @@ <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will block incoming messages from pubsub.</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_block_pubsub_messages_checkbutton_toggled"/> + <signal name="toggled" handler="on_block_pubsub_messages_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -31,11 +34,13 @@ <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remove XHTML from incoming multi-user chat messages</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_xhtml_muc_checkbutton_toggled"/> + <signal name="toggled" handler="on_disable_xhtml_muc_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -46,11 +51,13 @@ <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will remove XHTML from incoming private messages</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_disable_xhtml_pm_checkbutton_toggled"/> + <signal name="toggled" handler="on_disable_xhtml_pm_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> @@ -61,14 +68,52 @@ <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will block incoming subscription requests</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_block_subscription_requests_checkbutton_toggled"/> + <signal name="toggled" handler="on_block_subscription_requests_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> + <child> + <object class="GtkHBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Message size limit:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="message_size_limit_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_message_size_limit_entry_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> </object> </child> </object> diff -r 9fa9ce820249 -r de8e9bc4f357 anti_spam/manifest.ini --- a/anti_spam/manifest.ini Sat Jun 20 21:26:53 2015 +0200 +++ b/anti_spam/manifest.ini Fri Jul 24 23:35:55 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Anti Spam short_name: anti_spam -version: 0.3.1 +version: 0.4.1 description: Block some incoming messages. authors = Yann Leboulanger <asterix(a)lagaule.org> Denis Fomin <fominde(a)gmail.com>

1 0

gajim: fix tag
by Gajim 24 Jul '15

24 Jul '15

changeset aa1b7f9b942b 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=aa1b7f9b942b description: fix tag diffstat: .hgtags | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r 9b5eaf71e267 -r aa1b7f9b942b .hgtags --- a/.hgtags Fri Jul 24 22:22:39 2015 +0200 +++ b/.hgtags Fri Jul 24 22:25:24 2015 +0200 @@ -14,4 +14,4 @@ 129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 -d96858fee8dbe03f4e990a7c822e9bf12f42b0a3 gajim-0.16.2 +9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2

1 0

gajim: fix date and version for windows files
by Gajim 24 Jul '15

24 Jul '15

changeset 9b5eaf71e267 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=9b5eaf71e267 description: fix date and version for windows files diffstat: ChangeLog | 2 +- debian/changelog | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 0ad486b1baa0 -r 9b5eaf71e267 ChangeLog --- a/ChangeLog Fri Jul 24 22:07:38 2015 +0200 +++ b/ChangeLog Fri Jul 24 22:22:39 2015 +0200 @@ -1,4 +1,4 @@ -Gajim 0.16.2 (20 July 2015) +Gajim 0.16.2 (24 July 2015) * improve Zeroconf under windows and with IPv6 * Fix errors with GnuPG diff -r 0ad486b1baa0 -r 9b5eaf71e267 debian/changelog --- a/debian/changelog Fri Jul 24 22:07:38 2015 +0200 +++ b/debian/changelog Fri Jul 24 22:22:39 2015 +0200 @@ -2,7 +2,7 @@ * New upstream release - -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 20 Jul 2014 22:30:10 +0200 + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 24 Jul 2014 22:30:10 +0200 gajim (0.16.1-1) unstable; urgency=low diff -r 0ad486b1baa0 -r 9b5eaf71e267 gajim.nsi --- a/gajim.nsi Fri Jul 24 22:07:38 2015 +0200 +++ b/gajim.nsi Fri Jul 24 22:22:39 2015 +0200 @@ -212,7 +212,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.2" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 0ad486b1baa0 -r 9b5eaf71e267 setup_win32.py --- a/setup_win32.py Fri Jul 24 22:07:38 2015 +0200 +++ b/setup_win32.py Fri Jul 24 22:22:39 2015 +0200 @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.16', + version='0.16.2', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/',

1 0

gajim: Added tag gajim-0.16.2 for changeset d96858fee8db
by Gajim 24 Jul '15

24 Jul '15

changeset 0ad486b1baa0 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=0ad486b1baa0 description: Added tag gajim-0.16.2 for changeset d96858fee8db diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r d96858fee8db -r 0ad486b1baa0 .hgtags --- a/.hgtags Fri Jul 24 21:56:22 2015 +0200 +++ b/.hgtags Fri Jul 24 22:07:38 2015 +0200 @@ -14,3 +14,4 @@ 129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 +d96858fee8dbe03f4e990a7c822e9bf12f42b0a3 gajim-0.16.2

1 0

gajim: prepare 0.16.2 release
by Gajim 24 Jul '15

24 Jul '15

changeset d96858fee8db 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=d96858fee8db description: prepare 0.16.2 release diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- debian/changelog | 6 ++++++ src/common/defs.py | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diffs (48 lines): diff -r c6f5f98b414e -r d96858fee8db ChangeLog --- a/ChangeLog Fri Jul 24 21:53:58 2015 +0200 +++ b/ChangeLog Fri Jul 24 21:56:22 2015 +0200 @@ -1,3 +1,9 @@ +Gajim 0.16.2 (20 July 2015) + + * improve Zeroconf under windows and with IPv6 + * Fix errors with GnuPG + * Minor fixes and improvements + Gajim 0.16.1 (28 February 2015) * Fix sending Zeroconf messages diff -r c6f5f98b414e -r d96858fee8db autogen.sh --- a/autogen.sh Fri Jul 24 21:53:58 2015 +0200 +++ b/autogen.sh Fri Jul 24 21:56:22 2015 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.1" + gajimversion="0.16.2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r c6f5f98b414e -r d96858fee8db debian/changelog --- a/debian/changelog Fri Jul 24 21:53:58 2015 +0200 +++ b/debian/changelog Fri Jul 24 21:56:22 2015 +0200 @@ -1,3 +1,9 @@ +gajim (0.16.2-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 20 Jul 2014 22:30:10 +0200 + gajim (0.16.1-1) unstable; urgency=low * New upstream release diff -r c6f5f98b414e -r d96858fee8db src/common/defs.py --- a/src/common/defs.py Fri Jul 24 21:53:58 2015 +0200 +++ b/src/common/defs.py Fri Jul 24 21:56:22 2015 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.1' +version = '0.16.2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: if config file says password is saved with libsecret (wit...
by Gajim 24 Jul '15

24 Jul '15

changeset c6f5f98b414e 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=c6f5f98b414e description: if config file says password is saved with libsecret (with py3 branch) we can still get it with gnomekeyring diffstat: src/common/passwords.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r eeb4e7569b46 -r c6f5f98b414e src/common/passwords.py --- a/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:53:58 2015 +0200 @@ -45,8 +45,8 @@ class SimplePasswordStorage(PasswordStorage): def get_password(self, account_name): passwd = gajim.config.get_per('accounts', account_name, 'password') - if passwd and (passwd.startswith('gnomekeyring:') or \ - passwd == '<kwallet>'): + if passwd and (passwd.startswith('gnomekeyring:') or passwd.startswith('libsecret:') or \ + passwd == '<kwallet>'): # this is not a real password, it's either a gnome # keyring token or stored in the KDE wallet return None @@ -73,7 +73,7 @@ conf = gajim.config.get_per('accounts', account_name, 'password') if conf is None or conf == '<kwallet>': return None - if not conf.startswith('gnomekeyring:'): + if not (conf.startswith('gnomekeyring:') or conf.startswith('libsecret')): password = conf ## migrate the password over to keyring try:

1 0

gajim: no need to do gnomekeyring -> libsecret conversion when u...
by Gajim 24 Jul '15

24 Jul '15

changeset 1839ecb719cc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1839ecb719cc description: no need to do gnomekeyring -> libsecret conversion when using proper schema diffstat: src/common/passwords.py | 29 +++++------------------------ 1 files changed, 5 insertions(+), 24 deletions(-) diffs (64 lines): diff -r bab28241265d -r 1839ecb719cc src/common/passwords.py --- a/src/common/passwords.py Mon Jul 20 20:08:55 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:49:10 2015 +0200 @@ -158,11 +158,12 @@ class SecretPasswordStorage(PasswordStorage): def __init__(self): - self.GAJIM_SCHEMA = Secret.Schema.new("Gajim", + self.GAJIM_SCHEMA = Secret.Schema.new("org.gnome.keyring.NetworkPassword", Secret.SchemaFlags.NONE, { 'user': Secret.SchemaAttributeType.STRING, 'server': Secret.SchemaAttributeType.STRING, + 'protocol': Secret.SchemaAttributeType.STRING, } ) @@ -177,27 +178,7 @@ password = kw_storage.get_password(account_name) self.save_password(account_name, password) return password - if conf.startswith('gnomekeyring:'): - # migrate from libgnomekeyring - GnomePasswordStorage - global GnomeKeyring - global USER_HAS_GNOMEKEYRING - if not USER_HAS_GNOMEKEYRING: - try: - gir = __import__('gi.repository', globals(), locals(), - ['GnomeKeyring'], 0) - GnomeKeyring = gir.GnomeKeyring - except (ImportError, AttributeError): - return False - USER_HAS_GNOMEKEYRING = True - try: - gk_storage = GnomePasswordStorage() - except GnomeKeyringError: - return None - password = gk_storage.get_password(account_name) - self.save_password(account_name, password) - return password - if not conf.startswith('libsecret:'): + if not (conf.startswith('libsecret:') or conf.startswith('gnomekeyring:')): password = conf ## migrate the password over to keyring try: @@ -209,7 +190,7 @@ server = gajim.config.get_per('accounts', account_name, 'hostname') user = gajim.config.get_per('accounts', account_name, 'name') password = Secret.password_lookup_sync(self.GAJIM_SCHEMA, {'user': user, - 'server': server}, None) + 'server': server, 'protocol': 'xmpp'}, None) return password def save_password(self, account_name, password, update=True): @@ -218,7 +199,7 @@ display_name = _('XMPP account %s@%s') % (user, server) if password is None: password = str() - attributes = {'user': user, 'server': server} + attributes = {'user': user, 'server': server, 'protocol': 'xmpp'} Secret.password_store_sync(self.GAJIM_SCHEMA, attributes, Secret.COLLECTION_DEFAULT, display_name, password, None) gajim.config.set_per('accounts', account_name, 'password',

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015