Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: fix adding a new preset status message. Fixes #7488
by Gajim 30 Dec '13

30 Dec '13

changeset 1380b5a58dbb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1380b5a58dbb description: fix adding a new preset status message. Fixes #7488 diffstat: src/config.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (26 lines): diff -r cd988cd1c310 -r 1380b5a58dbb src/config.py --- a/src/config.py Wed Oct 30 12:40:31 2013 +0100 +++ b/src/config.py Wed Oct 30 13:13:00 2013 +0100 @@ -1095,8 +1095,10 @@ # store mood / activity for subname in ('activity', 'subactivity', 'activity_text', 'mood', 'mood_text'): - val = model[iter_][i] - gajim.config.set_per('statusmsg', val, subname, val) + val2 = model[iter_][i] + if not val2: + val2 = '' + gajim.config.set_per('statusmsg', val, subname, val2) i += 1 iter_ = model.iter_next(iter_) @@ -1229,7 +1231,8 @@ def on_new_msg_button_clicked(self, widget, data = None): model = self.msg_tree.get_model() iter_ = model.append() - model.set(iter_, 0, _('status message title'), 1, _('status message text')) + model.set(iter_, 0, _('status message title'), 1, + _('status message text')) self.msg_tree.set_cursor(model.get_path(iter_)) def on_delete_msg_button_clicked(self, widget, data = None):

1 0

gajim: Fix transport detection
by Gajim 30 Dec '13

30 Dec '13

changeset 6f98d7119c9c in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6f98d7119c9c description: Fix transport detection diffstat: src/gui_menu_builder.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 4a39c2cfea9e -r 6f98d7119c9c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Oct 25 20:51:32 2013 +0400 +++ b/src/gui_menu_builder.py Fri Oct 25 21:49:07 2013 +0400 @@ -478,7 +478,8 @@ if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + if gajim.get_transport_name_from_jid(jid, use_config_setting=False)\ + and transport != 'jabber': unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -490,7 +491,8 @@ else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if gajim.get_transport_name_from_jid(jid, use_config_setting=False): + if gajim.get_transport_name_from_jid(jid, use_config_setting=False)\ + and transport != 'jabber': block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False)

1 0

gajim: Fix (Un)Block multiple contacts menu. Fixes #7526
by Gajim 30 Dec '13

30 Dec '13

changeset fab9eba4eb61 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=fab9eba4eb61 description: Fix (Un)Block multiple contacts menu. Fixes #7526 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6f98d7119c9c -r fab9eba4eb61 src/roster_window.py --- a/src/roster_window.py Fri Oct 25 21:49:07 2013 +0400 +++ b/src/roster_window.py Fri Oct 25 22:07:15 2013 +0400 @@ -5915,7 +5915,7 @@ privacy_rules_supported = False contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - if helpers.jid_is_blocked(account, jid): + if not helpers.jid_is_blocked(account, jid): is_blocked = False list_.append((contact, account))

1 0

gajim: Edit _Groups -> Edit _Groups... is when several contacts ...
by Gajim 30 Dec '13

30 Dec '13

changeset 7ac6cbe85087 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7ac6cbe85087 description: Edit _Groups -> Edit _Groups... is when several contacts are selected. See #7519 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fab9eba4eb61 -r 7ac6cbe85087 src/roster_window.py --- a/src/roster_window.py Fri Oct 25 22:07:15 2013 +0400 +++ b/src/roster_window.py Sat Oct 26 00:05:09 2013 +0400 @@ -5959,7 +5959,7 @@ # Edit Groups edit_groups_item = Gtk.ImageMenuItem.new_with_mnemonic(_( - 'Edit _Groups')) + 'Edit _Groups...')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_EDIT, Gtk.IconSize.MENU) edit_groups_item.set_image(icon) manage_contacts_submenu.append(edit_groups_item)

1 0

gajim: fix receiving single messages
by Gajim 30 Dec '13

30 Dec '13

changeset c8b9ae19a10b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c8b9ae19a10b description: fix receiving single messages diffstat: src/roster_window.py | 11 +++++++++-- src/session.py | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diffs (41 lines): diff -r 7ac6cbe85087 -r c8b9ae19a10b src/roster_window.py --- a/src/roster_window.py Sat Oct 26 00:05:09 2013 +0400 +++ b/src/roster_window.py Mon Oct 28 11:23:54 2013 +0100 @@ -2717,7 +2717,14 @@ return True if obj.mtype not in ('normal', 'chat'): return - if obj.session.control: + if obj.mtype == 'normal' and obj.popup: + # it's single message to be autopopuped + dialogs.SingleMessageWindow(obj.conn.name, obj.jid, + action='receive', from_whom=obj.jid, subject=obj.subject, + message=obj.msgtxt, resource=obj.resource, session=obj.session, + form_node=obj.form_node) + return + if obj.session.control and obj.mtype == 'chat': typ = '' if obj.mtype == 'error': typ = 'error' @@ -2734,7 +2741,7 @@ if not pw or (pw.get_active_control() and obj.session.control \ == pw.get_active_control() and pw.is_active() and end): gajim.logger.set_read_messages([obj.msg_id]) - elif obj.popup: + elif obj.popup and obj.mtype == 'chat': contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact, obj.conn.name, session=obj.session) diff -r 7ac6cbe85087 -r c8b9ae19a10b src/session.py --- a/src/session.py Sat Oct 26 00:05:09 2013 +0400 +++ b/src/session.py Mon Oct 28 11:23:54 2013 +0100 @@ -237,7 +237,8 @@ obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - if not self.control: + if (not self.control and obj.mtype != 'normal') or \ + (obj.mtype != 'normal' and not obj.popup): event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking,

1 0

gajim: Use Active instead of Enabled in Account Preferences. Fix...
by Gajim 30 Dec '13

30 Dec '13

changeset 8aafc370d433 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8aafc370d433 description: Use Active instead of Enabled in Account Preferences. Fixes #7424 diffstat: data/gui/accounts_window.ui | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 06b73b4df7b1 -r 8aafc370d433 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Tue Oct 22 13:43:34 2013 +0400 +++ b/data/gui/accounts_window.ui Tue Oct 22 23:59:53 2013 +0400 @@ -137,7 +137,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="enable_checkbutton1"> - <property name="label" translatable="yes">_Enable</property> + <property name="label" translatable="yes">Active</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -1033,7 +1033,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="enable_zeroconf_checkbutton2"> - <property name="label" translatable="yes">_Enable</property> + <property name="label" translatable="yes">Active</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property>

1 0

gajim: Set transient_for 'Bookmark already set' and 'Bookmark ha...
by Gajim 30 Dec '13

30 Dec '13

changeset 2b6b48e9d97c in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2b6b48e9d97c description: Set transient_for 'Bookmark already set' and 'Bookmark has been added successfully' in disco diffstat: src/disco.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 8aafc370d433 -r 2b6b48e9d97c src/disco.py --- a/src/disco.py Tue Oct 22 23:59:53 2013 +0400 +++ b/src/disco.py Thu Oct 24 14:17:30 2013 +0400 @@ -1881,7 +1881,8 @@ for bookmark in gajim.connections[self.account].bookmarks: if bookmark['jid'] == bm['jid']: dialogs.ErrorDialog( _('Bookmark already set'), - _('Group Chat "%s" is already in your bookmarks.') % bm['jid']) + _('Group Chat "%s" is already in your bookmarks.') % bm['jid'], + transient_for=self.window.window) return gajim.connections[self.account].bookmarks.append(bm) @@ -1891,7 +1892,8 @@ dialogs.InformationDialog( _('Bookmark has been added successfully'), - _('You can manage your bookmarks via Actions menu in your roster.')) + _('You can manage your bookmarks via Actions menu in your roster.'), + transient_for=self.window.window) def on_join_button_clicked(self, *args): """

1 0

gajim: Fix button name. Fixes #7521
by Gajim 30 Dec '13

30 Dec '13

changeset 4dc0edf1ef52 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4dc0edf1ef52 description: Fix button name. Fixes #7521 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b6b48e9d97c -r 4dc0edf1ef52 src/dialogs.py --- a/src/dialogs.py Thu Oct 24 14:17:30 2013 +0400 +++ b/src/dialogs.py Fri Oct 25 15:24:26 2013 +0400 @@ -5161,7 +5161,7 @@ self.security_image = self.xml.get_object('security_image') self.verify_now_button = self.xml.get_object('verify_now_button') - self.button_label = self.xml.get_object('button_label') + self.button_label = self.xml.get_object('verification_status_label') self.window = self.xml.get_object('esession_info_window') self.update_info() self.window.set_transient_for(transient_for)

1 0

gajim: [Darlan] Change mnemonic in roster context menu
by Gajim 30 Dec '13

30 Dec '13

changeset 4a39c2cfea9e in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4a39c2cfea9e description: [Darlan] Change mnemonic in roster context menu diffstat: src/roster_window.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 4dc0edf1ef52 -r 4a39c2cfea9e src/roster_window.py --- a/src/roster_window.py Fri Oct 25 15:24:26 2013 +0400 +++ b/src/roster_window.py Fri Oct 25 20:51:32 2013 +0400 @@ -5822,7 +5822,7 @@ menu.append(item) # Rename - rename_item = Gtk.ImageMenuItem.new_with_mnemonic(_('Re_name')) + rename_item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename...')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(rename_item, 'gajim-kbd_input') menu.append(rename_item) @@ -5860,7 +5860,7 @@ block_menuitem.set_sensitive(False) # Remove group - remove_item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Remove')) + remove_item = Gtk.ImageMenuItem.new_with_mnemonic(_('Remo_ve')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) remove_item.set_image(icon) @@ -6094,7 +6094,7 @@ item.set_sensitive(False) # Rename - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Rename...')) # add a special img for rename menuitem gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') manage_transport_submenu.append(item) @@ -6120,7 +6120,7 @@ item.set_sensitive(False) # Remove - item = Gtk.ImageMenuItem.new_with_mnemonic(_('_Remove')) + item = Gtk.ImageMenuItem.new_with_mnemonic(_('Remo_ve')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_REMOVE, Gtk.IconSize.MENU) item.set_image(icon) manage_transport_submenu.append(item)

1 0

gajim: Set transient_for for 'Wrong server' error dialog in join gc
by Gajim 30 Dec '13

30 Dec '13

changeset 28c252877464 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=28c252877464 description: Set transient_for for 'Wrong server' error dialog in join gc diffstat: src/dialogs.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (14 lines): diff -r f95c078f3c74 -r 28c252877464 src/dialogs.py --- a/src/dialogs.py Mon Oct 14 16:11:50 2013 +0400 +++ b/src/dialogs.py Tue Oct 15 09:59:05 2013 +0400 @@ -2578,8 +2578,9 @@ if obj.jid != self.requested_jid: return self.requested_jid = None + window = gajim.interface.instances[self.account]['join_gc'].window ErrorDialog(_('Wrong server'), _('%s is not a groupchat server') % \ - obj.jid) + obj.jid, transient_for=window) def _nec_agent_info_received(self, obj): if obj.conn.name != self.account:

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

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 December 2013