Commits April 2011

commits@gajim.org

3 participants
31 discussions

gajim: change rfilter keyboard shorcut to ctrl+l because ctrl+i ...
by Julien Pivotto 19 Apr '11

19 Apr '11

changeset 1880b5dd2cdb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1880b5dd2cdb description: change rfilter keyboard shorcut to ctrl+l because ctrl+i was already used. diffstat: data/gui/roster_window.ui | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ca4037b81152 -r 1880b5dd2cdb data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 22:50:39 2011 +0200 +++ b/data/gui/roster_window.ui Tue Apr 19 08:54:41 2011 +0200 @@ -222,10 +222,10 @@ <object class="GtkCheckMenuItem" id="show_rfilter_menuitem"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show Roster F_ilter</property> + <property name="label" translatable="yes">Show Roster Fi_lter</property> <property name="use_underline">True</property> <property name="active">False</property> - <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/> + <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="toggled" handler="on_show_rfilter_menuitem_toggled"/> </object> </child>

1 0

gajim: ability to see certificate on ssl error dialog. Fixes #3998
by Yann Leboulanger 18 Apr '11

18 Apr '11

changeset ca4037b81152 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca4037b81152 description: ability to see certificate on ssl error dialog. Fixes #3998 diffstat: src/common/connection.py | 3 ++- src/dialogs.py | 21 +++++++++++++++++++-- src/gui_interface.py | 5 +++-- 3 files changed, 24 insertions(+), 5 deletions(-) diffs (63 lines): diff -r 5c6d064eee16 -r ca4037b81152 src/common/connection.py --- a/src/common/connection.py Mon Apr 18 22:36:06 2011 +0200 +++ b/src/common/connection.py Mon Apr 18 22:50:39 2011 +0200 @@ -1273,7 +1273,8 @@ gajim.nec.push_incoming_event(SSLErrorEvent(None, conn=self, error_text=text, error_num=errnum, cert=con.Connection.ssl_cert_pem, - fingerprint=con.Connection.ssl_fingerprint_sha1)) + fingerprint=con.Connection.ssl_fingerprint_sha1, + certificate=con.Connection.ssl_certificate)) return True if hasattr(con.Connection, 'ssl_fingerprint_sha1'): saved_fingerprint = gajim.config.get_per('accounts', self.name, 'ssl_fingerprint_sha1') diff -r 5c6d064eee16 -r ca4037b81152 src/dialogs.py --- a/src/dialogs.py Mon Apr 18 22:36:06 2011 +0200 +++ b/src/dialogs.py Mon Apr 18 22:50:39 2011 +0200 @@ -5646,11 +5646,28 @@ self.cert = certificate YesNoDialog.__init__(self, pritext, sectext, checktext, on_response_yes, on_response_no) - b = gtk.Button('View cert...') + b = gtk.Button(_('View cert...')) b.connect('clicked', self.on_cert_clicked) b.show_all() area = self.get_action_area() area.pack_start(b) def on_cert_clicked(self, button): - d = CertificatDialog(self, self.account, self.cert) \ No newline at end of file + d = CertificatDialog(self, self.account, self.cert) + +class SSLErrorDialog(ConfirmationDialogDoubleCheck): + def __init__(self, account, certificate, pritext, sectext, checktext1, + checktext2, on_response_ok=None, on_response_cancel=None): + self.account = account + self.cert = certificate + ConfirmationDialogDoubleCheck.__init__(self, pritext, sectext, + checktext1, checktext2, on_response_ok, on_response_cancel, + is_modal=False) + b = gtk.Button(_('View cert...')) + b.connect('clicked', self.on_cert_clicked) + b.show_all() + area = self.get_action_area() + area.pack_start(b) + + def on_cert_clicked(self, button): + d = CertificatDialog(self, self.account, self.cert) diff -r 5c6d064eee16 -r ca4037b81152 src/gui_interface.py --- a/src/gui_interface.py Mon Apr 18 22:36:06 2011 +0200 +++ b/src/gui_interface.py Mon Apr 18 22:50:39 2011 +0200 @@ -1219,8 +1219,9 @@ if 'ssl_error' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['ssl_error'].destroy() self.instances[account]['online_dialog']['ssl_error'] = \ - dialogs.ConfirmationDialogDoubleCheck(pritext, sectext, checktext1, - checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) + dialogs.SSLErrorDialog(obj.conn.name, obj.certificate, pritext, + sectext, checktext1, checktext2, on_response_ok=on_ok, + on_response_cancel=on_cancel) def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint,))

1 0

gajim: ability to see certificate information when fingerprint c...
by Yann Leboulanger 18 Apr '11

18 Apr '11

changeset 5c6d064eee16 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5c6d064eee16 description: ability to see certificate information when fingerprint changes. see #3998 diffstat: src/common/connection.py | 2 +- src/common/xmpp/tls_nb.py | 1 + src/dialogs.py | 48 +++++++++++++++++++++++++++++++++++++++++++++++ src/gui_interface.py | 5 ++- 4 files changed, 53 insertions(+), 3 deletions(-) diffs (94 lines): diff -r 98d176535851 -r 5c6d064eee16 src/common/connection.py --- a/src/common/connection.py Mon Apr 18 12:10:47 2011 +0200 +++ b/src/common/connection.py Mon Apr 18 22:36:06 2011 +0200 @@ -1281,7 +1281,7 @@ # Check sha1 fingerprint if con.Connection.ssl_fingerprint_sha1 != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, - conn=self, + conn=self, certificate=con.Connection.ssl_certificate, new_fingerprint=con.Connection.ssl_fingerprint_sha1)) return True else: diff -r 98d176535851 -r 5c6d064eee16 src/common/xmpp/tls_nb.py --- a/src/common/xmpp/tls_nb.py Mon Apr 18 12:10:47 2011 +0200 +++ b/src/common/xmpp/tls_nb.py Mon Apr 18 22:36:06 2011 +0200 @@ -449,6 +449,7 @@ # Exceptions can't propagate up through this callback, so print them here. try: self._owner.ssl_fingerprint_sha1 = cert.digest('sha1') + self._owner.ssl_certificate = cert if errnum == 0: return True self._owner.ssl_errnum = errnum diff -r 98d176535851 -r 5c6d064eee16 src/dialogs.py --- a/src/dialogs.py Mon Apr 18 12:10:47 2011 +0200 +++ b/src/dialogs.py Mon Apr 18 22:36:06 2011 +0200 @@ -5606,3 +5606,51 @@ session.reject_content(content) dialog.destroy() + +class CertificatDialog(InformationDialog): + def __init__(self, parent, account, cert): + issuer = cert.get_issuer() + subject = cert.get_subject() + InformationDialog.__init__(self, + _('Certificate for account %s') % account, _('''Issued to: +Common Name (CN): %(scn)s +Organization (O): %(sorg)s +Organizationl Unit (OU): %(sou)s +Serial Number: %(sn)s + +Issued by: +Common Name (CN): %(icn)s +Organization (O): %(iorg)s +Organizationl Unit (OU): %(iou)s + +Validity: +Issued on: %(io)s +Expires on: %(eo)s + +Fingerprint +SHA1 Fingerprint: %(sha1)s''') % { + 'scn': subject.commonName, 'sorg': subject.organizationName, + 'sou': subject.organizationalUnitName, + 'sn': cert.get_serial_number(), 'icn': issuer.commonName, + 'iorg': issuer.organizationName, + 'iou': issuer.organizationalUnitName, + 'io': cert.get_notBefore(), 'eo': cert.get_notAfter(), + 'sha1': cert.digest('sha1')}) + self.set_transient_for(parent) + + +class CheckFingerprintDialog(YesNoDialog): + def __init__(self, pritext='', sectext='', checktext='', + on_response_yes=None, on_response_no=None, account=None, certificate=None): + self.account = account + self.cert = certificate + YesNoDialog.__init__(self, pritext, sectext, checktext, on_response_yes, + on_response_no) + b = gtk.Button('View cert...') + b.connect('clicked', self.on_cert_clicked) + b.show_all() + area = self.get_action_area() + area.pack_start(b) + + def on_cert_clicked(self, button): + d = CertificatDialog(self, self.account, self.cert) \ No newline at end of file diff -r 98d176535851 -r 5c6d064eee16 src/gui_interface.py --- a/src/gui_interface.py Mon Apr 18 12:10:47 2011 +0200 +++ b/src/gui_interface.py Mon Apr 18 22:36:06 2011 +0200 @@ -1250,8 +1250,9 @@ self.instances[account]['online_dialog']['fingerprint_error'].\ destroy() self.instances[account]['online_dialog']['fingerprint_error'] = \ - dialogs.YesNoDialog(pritext, sectext, on_response_yes=on_yes, - on_response_no=on_no) + dialogs.CheckFingerprintDialog(pritext, sectext, on_response_yes=on_yes, + on_response_no=on_no, account=obj.conn.name, + certificate=obj.certificate) def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection))

1 0

gajim: change rfilter stock icon from gtk-close to gtk-clear
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 98d176535851 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=98d176535851 description: change rfilter stock icon from gtk-close to gtk-clear diffstat: data/gui/roster_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2e62aba5e925 -r 98d176535851 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 12:04:47 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 12:10:47 2011 +0200 @@ -348,7 +348,7 @@ <property name="no_show_all">True</property> <property name="editable">False</property> <property name="can_focus">True</property> - <property name="primary_icon_stock">gtk-close</property> + <property name="primary_icon_stock">gtk-clear</property> <property name="primary_icon_activatable">True</property> <signal name="changed" handler="on_rfilter_entry_changed"/> <signal name="icon_press" handler="on_rfilter_entry_icon_press"/>

1 0

gajim: rename roster_filter_ to rfilter_. and special thanks to ...
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 2e62aba5e925 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2e62aba5e925 description: rename roster_filter_ to rfilter_. and special thanks to otradox for his patch. fix #5221 diffstat: data/gui/roster_window.ui | 10 +++++----- src/roster_window.py | 40 ++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diffs (111 lines): diff -r 7fc83128be35 -r 2e62aba5e925 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 12:01:29 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 12:04:47 2011 +0200 @@ -219,14 +219,14 @@ </object> </child> <child> - <object class="GtkCheckMenuItem" id="show_roster_filter_menuitem"> + <object class="GtkCheckMenuItem" id="show_rfilter_menuitem"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Show Roster F_ilter</property> <property name="use_underline">True</property> <property name="active">False</property> <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="toggled" handler="on_show_roster_filter_menuitem_toggled"/> + <signal name="toggled" handler="on_show_rfilter_menuitem_toggled"/> </object> </child> <child> @@ -343,15 +343,15 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="orientation">vertical</property> <child> - <object class="GtkEntry" id="roster_filter_entry"> + <object class="GtkEntry" id="rfilter_entry"> <property name="visible">False</property> <property name="no_show_all">True</property> <property name="editable">False</property> <property name="can_focus">True</property> <property name="primary_icon_stock">gtk-close</property> <property name="primary_icon_activatable">True</property> - <signal name="changed" handler="on_roster_filter_entry_changed"/> - <signal name="icon_press" handler="on_roster_filter_entry_icon_press"/> + <signal name="changed" handler="on_rfilter_entry_changed"/> + <signal name="icon_press" handler="on_rfilter_entry_icon_press"/> </object> <packing> <property name="expand">False</property> diff -r 7fc83128be35 -r 2e62aba5e925 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 12:01:29 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 12:04:47 2011 +0200 @@ -1589,8 +1589,8 @@ grp = delimiter.join(grp.split(delimiter)[:-1]) return False if type_ == 'contact': - if self.roster_filter_enabled: - return self.roster_filter_string in model[titer][C_NAME].lower() + if self.rfilter_enabled: + return self.rfilter_string in model[titer][C_NAME].lower() if gajim.config.get('showoffline'): return True bb_jid = None @@ -4167,29 +4167,29 @@ if self.hpaned.get_child2() is not None: self.show_roster_vbox(widget.get_active()) - def on_roster_filter_entry_changed(self, widget): + def on_rfilter_entry_changed(self, widget): """ When we update the content of the filter """ - self.roster_filter_string = widget.get_text().lower() - if self.roster_filter_string == '': - self.roster_filter_enabled = False + self.rfilter_string = widget.get_text().lower() + if self.rfilter_string == '': + self.rfilter_enabled = False else: - self.roster_filter_enabled = True + self.rfilter_enabled = True self.refilter_shown_roster_items() - def on_roster_filter_entry_icon_press(self, widget, icon, event): + def on_rfilter_entry_icon_press(self, widget, icon, event): """ Disable the roster filtering by clicking the icon in the textEntry """ - self.xml.get_object('show_roster_filter_menuitem').set_active(False) - self.roster_filter_enabled = False + self.xml.get_object('show_rfilter_menuitem').set_active(False) + self.rfilter_enabled = False self.refilter_shown_roster_items() - def on_show_roster_filter_menuitem_toggled(self, widget): + def on_show_rfilter_menuitem_toggled(self, widget): """ Show the roster filter entry """ - self.roster_filter_enabled = widget.get_active() - self.roster_filter_entry.set_visible(self.roster_filter_enabled) - self.roster_filter_entry.set_editable(self.roster_filter_enabled) - if self.roster_filter_enabled: - self.roster_filter_entry.set_text('') - self.roster_filter_entry.grab_focus() + self.rfilter_enabled = widget.get_active() + self.rfilter_entry.set_visible(self.rfilter_enabled) + self.rfilter_entry.set_editable(self.rfilter_enabled) + if self.rfilter_enabled: + self.rfilter_entry.set_text('') + self.rfilter_entry.grab_focus() def on_roster_hpaned_notify(self, pane, gparamspec): """ @@ -6372,9 +6372,9 @@ gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) # Setting the search stuff - self.roster_filter_entry = self.xml.get_object('roster_filter_entry') - self.roster_filter_string = '' - self.roster_filter_enabled = False + self.rfilter_entry = self.xml.get_object('rfilter_entry') + self.rfilter_string = '' + self.rfilter_enabled = False gajim.ged.register_event_handler('presence-received', ged.GUI1, self._nec_presence_received)

1 0

gajim: rename search_ to roster_filter_
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 7fc83128be35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7fc83128be35 description: rename search_ to roster_filter_ diffstat: src/roster_window.py | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diffs (60 lines): diff -r a39fbcbc9ccc -r 7fc83128be35 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 11:58:55 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 12:01:29 2011 +0200 @@ -1589,8 +1589,8 @@ grp = delimiter.join(grp.split(delimiter)[:-1]) return False if type_ == 'contact': - if self.search_enabled: - return self.search_string in model[titer][C_NAME].lower() + if self.roster_filter_enabled: + return self.roster_filter_string in model[titer][C_NAME].lower() if gajim.config.get('showoffline'): return True bb_jid = None @@ -4169,25 +4169,25 @@ def on_roster_filter_entry_changed(self, widget): """ When we update the content of the filter """ - self.search_string = widget.get_text().lower() - if self.search_string == '': - self.search_enabled = False + self.roster_filter_string = widget.get_text().lower() + if self.roster_filter_string == '': + self.roster_filter_enabled = False else: - self.search_enabled = True + self.roster_filter_enabled = True self.refilter_shown_roster_items() def on_roster_filter_entry_icon_press(self, widget, icon, event): """ Disable the roster filtering by clicking the icon in the textEntry """ self.xml.get_object('show_roster_filter_menuitem').set_active(False) - self.search_enabled = False + self.roster_filter_enabled = False self.refilter_shown_roster_items() def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """ - self.search_enabled = widget.get_active() - self.roster_filter_entry.set_visible(self.search_enabled) - self.roster_filter_entry.set_editable(self.search_enabled) - if self.search_enabled: + self.roster_filter_enabled = widget.get_active() + self.roster_filter_entry.set_visible(self.roster_filter_enabled) + self.roster_filter_entry.set_editable(self.roster_filter_enabled) + if self.roster_filter_enabled: self.roster_filter_entry.set_text('') self.roster_filter_entry.grab_focus() @@ -6373,8 +6373,8 @@ # Setting the search stuff self.roster_filter_entry = self.xml.get_object('roster_filter_entry') - self.search_string = '' - self.search_enabled = False + self.roster_filter_string = '' + self.roster_filter_enabled = False gajim.ged.register_event_handler('presence-received', ged.GUI1, self._nec_presence_received)

1 0

gajim: avoid multiple calls to self.xml.get_object
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset a39fbcbc9ccc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a39fbcbc9ccc description: avoid multiple calls to self.xml.get_object diffstat: src/roster_window.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 0cc2b1deecf0 -r a39fbcbc9ccc src/roster_window.py --- a/src/roster_window.py Mon Apr 18 11:53:46 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 11:58:55 2011 +0200 @@ -4185,11 +4185,11 @@ def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """ self.search_enabled = widget.get_active() - self.xml.get_object('roster_filter_entry').set_visible(self.search_enabled) - self.xml.get_object('roster_filter_entry').set_editable(self.search_enabled) + self.roster_filter_entry.set_visible(self.search_enabled) + self.roster_filter_entry.set_editable(self.search_enabled) if self.search_enabled: - self.xml.get_object('roster_filter_entry').set_text('') - self.xml.get_object('roster_filter_entry').grab_focus() + self.roster_filter_entry.set_text('') + self.roster_filter_entry.grab_focus() def on_roster_hpaned_notify(self, pane, gparamspec): """ @@ -6372,6 +6372,7 @@ gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) # Setting the search stuff + self.roster_filter_entry = self.xml.get_object('roster_filter_entry') self.search_string = '' self.search_enabled = False

1 0

gajim: enable clearing search with the icon
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 0cc2b1deecf0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0cc2b1deecf0 description: enable clearing search with the icon diffstat: data/gui/roster_window.ui | 1 - src/roster_window.py | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diffs (31 lines): diff -r a1b74605b627 -r 0cc2b1deecf0 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 11:36:42 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 11:53:46 2011 +0200 @@ -352,7 +352,6 @@ <property name="primary_icon_activatable">True</property> <signal name="changed" handler="on_roster_filter_entry_changed"/> <signal name="icon_press" handler="on_roster_filter_entry_icon_press"/> - <signal name="key_press_event" handler="on_roster_filter_entry_key_press_event"/> </object> <packing> <property name="expand">False</property> diff -r a1b74605b627 -r 0cc2b1deecf0 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 11:36:42 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 11:53:46 2011 +0200 @@ -4176,11 +4176,11 @@ self.search_enabled = True self.refilter_shown_roster_items() - def on_roster_filter_entry_icon_press(self, widget): - pass - - def on_roster_filter_entry_key_press_event(self, widget): - pass + def on_roster_filter_entry_icon_press(self, widget, icon, event): + """ Disable the roster filtering by clicking the icon in the textEntry """ + self.xml.get_object('show_roster_filter_menuitem').set_active(False) + self.search_enabled = False + self.refilter_shown_roster_items() def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """

1 0

gajim: add icon to roster filter
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset a1b74605b627 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1b74605b627 description: add icon to roster filter diffstat: data/gui/roster_window.ui | 6 +++++- src/roster_window.py | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diffs (39 lines): diff -r 266b4a5c99ee -r a1b74605b627 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 11:32:16 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 11:36:42 2011 +0200 @@ -348,7 +348,11 @@ <property name="no_show_all">True</property> <property name="editable">False</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_roster_filter_entry_changed" /> + <property name="primary_icon_stock">gtk-close</property> + <property name="primary_icon_activatable">True</property> + <signal name="changed" handler="on_roster_filter_entry_changed"/> + <signal name="icon_press" handler="on_roster_filter_entry_icon_press"/> + <signal name="key_press_event" handler="on_roster_filter_entry_key_press_event"/> </object> <packing> <property name="expand">False</property> diff -r 266b4a5c99ee -r a1b74605b627 src/roster_window.py --- a/src/roster_window.py Mon Apr 18 11:32:16 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 11:36:42 2011 +0200 @@ -4176,12 +4176,19 @@ self.search_enabled = True self.refilter_shown_roster_items() + def on_roster_filter_entry_icon_press(self, widget): + pass + + def on_roster_filter_entry_key_press_event(self, widget): + pass + def on_show_roster_filter_menuitem_toggled(self, widget): """ Show the roster filter entry """ self.search_enabled = widget.get_active() self.xml.get_object('roster_filter_entry').set_visible(self.search_enabled) self.xml.get_object('roster_filter_entry').set_editable(self.search_enabled) if self.search_enabled: + self.xml.get_object('roster_filter_entry').set_text('') self.xml.get_object('roster_filter_entry').grab_focus() def on_roster_hpaned_notify(self, pane, gparamspec):

1 0

gajim: Hide the roster_filter_entry better
by Julien Pivotto 18 Apr '11

18 Apr '11

changeset 266b4a5c99ee in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=266b4a5c99ee description: Hide the roster_filter_entry better diffstat: data/gui/roster_window.ui | 1 + src/roster_window.py | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 9cd45772dafb -r 266b4a5c99ee data/gui/roster_window.ui --- a/data/gui/roster_window.ui Mon Apr 18 11:19:44 2011 +0200 +++ b/data/gui/roster_window.ui Mon Apr 18 11:32:16 2011 +0200 @@ -345,6 +345,7 @@ <child> <object class="GtkEntry" id="roster_filter_entry"> <property name="visible">False</property> + <property name="no_show_all">True</property> <property name="editable">False</property> <property name="can_focus">True</property> <signal name="changed" handler="on_roster_filter_entry_changed" /> diff -r 9cd45772dafb -r 266b4a5c99ee src/roster_window.py --- a/src/roster_window.py Mon Apr 18 11:19:44 2011 +0200 +++ b/src/roster_window.py Mon Apr 18 11:32:16 2011 +0200 @@ -6365,7 +6365,6 @@ gtk.keysyms.n, gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) # Setting the search stuff - self.xml.get_object('roster_filter_entry').set_visible(False) self.search_string = '' self.search_enabled = False

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2011