Commits October 2009

commits@gajim.org

6 participants
172 discussions

gajim: merge jingle branch to default branche
by Yann Leboulanger 29 Oct '09

29 Oct '09

changeset cebed529e847 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cebed529e847 description: merge jingle branch to default branche diffstat: data/glade/message_window.glade | 322 ++++++--- data/glade/voip_call_received_dialog.glade | 39 + src/chat_control.py | 159 ++++ src/common/connection_handlers.py | 15 +- src/common/events.py | 3 +- src/common/gajim.py | 5 + src/common/helpers.py | 6 + src/common/jingle.py | 1165 +++++++++++++++++++++++++++++++++ src/common/meta.py | 36 + src/common/xmpp/protocol.py | 7 + src/common/xmpp/simplexml.py | 3 + src/dialogs.py | 105 +++ src/features_window.py | 7 + src/gajim.py | 107 +++- 14 files changed, 1866 insertions(+), 113 deletions(-) diffs (truncated from 2684 to 300 lines): diff -r 4f046069c031 -r cebed529e847 data/glade/message_window.glade --- a/data/glade/message_window.glade Thu Oct 29 11:35:22 2009 +0100 +++ b/data/glade/message_window.glade Thu Oct 29 11:55:05 2009 +0100 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> +  +  <widget class="GtkWindow" id="message_window"> <property name="default_width">480</property> <property name="default_height">440</property> @@ -40,6 +40,7 @@ <property name="expand">False</property> <property name="fill">False</property> <property name="padding">5</property> + <property name="position">0</property> </packing> </child> <child> @@ -54,6 +55,9 @@ <property name="label">Contact name</property> <property name="use_markup">True</property> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <placeholder/> @@ -71,14 +75,17 @@ <widget class="GtkImage" id="mood_image"> <property name="no_show_all">True</property> <property name="stock">None</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkImage" id="activity_image"> <property name="no_show_all">True</property> <property name="stock">None</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> <packing> <property name="position">1</property> @@ -87,14 +94,34 @@ <child> <widget class="GtkImage" id="tune_image"> <property name="no_show_all">True</property> - <property name="pixbuf">../emoticons/static/music.png</property> - <property name="icon_size">1</property> + <property name="pixbuf">../emoticons/static/music.png</property> + <property name="icon-size">1</property> </widget> <packing> <property name="position">2</property> </packing> </child> <child> + <widget class="GtkImage" id="audio_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + <child> + <widget class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </widget> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> <widget class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> @@ -103,7 +130,7 @@ </child> </widget> <packing> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> </widget> @@ -138,6 +165,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -148,35 +176,40 @@ <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> <placeholder/> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <widget class="GtkHBox" id="hbox"> <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> <child> <widget class="GtkButton" id="authentication_button"> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> - <property name="relief">GTK_RELIEF_NONE</property> + <property name="relief">none</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> <child> <widget class="GtkImage" id="lock_image"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -184,9 +217,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> <placeholder/> </child> @@ -212,37 +245,40 @@ <child> <widget class="GtkButton" id="emoticons_button"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="tooltip" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="relief">GTK_RELIEF_NONE</property> + <property name="relief">none</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> <child> <widget class="GtkImage" id="emoticons_button_image"> <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="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> <widget class="GtkButton" id="formattings_button"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="tooltip" translatable="yes">Show a list of formattings</property> - <property name="relief">GTK_RELIEF_NONE</property> + <property name="relief">none</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> <child> <widget class="GtkImage" id="image10"> <property name="visible">True</property> <property name="stock">gtk-bold</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> @@ -268,14 +304,13 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="tooltip" translatable="yes">Add this contact to roster (Ctrl+D)</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="response_id">0</property> + <property name="relief">none</property> <child> <widget class="GtkImage" id="image9"> <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="stock">gtk-add</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> @@ -288,16 +323,17 @@ <child> <widget class="GtkButton" id="send_file_button"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="tooltip" translatable="yes">Send a file (Ctrl+F)</property> - <property name="relief">GTK_RELIEF_NONE</property> + <property name="relief">none</property> <property name="focus_on_click">False</property> - <property name="response_id">0</property> <child> <widget class="GtkImage" id="image3"> <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="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> @@ -307,19 +343,16 @@ </packing> </child> <child> - <widget class="GtkButton" id="convert_to_gc_button"> - <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="tooltip" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> + <widget class="GtkToggleButton" id="audio_togglebutton"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip" translatable="yes">Toggle audio session</property> + <property name="relief">none</property> <child> - <widget class="GtkImage" id="convert_to_gc_button_image"> + <widget class="GtkImage" id="audio_image"> <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="stock">gtk-missing-image</property> - <property name="icon_size">1</property> + <property name="icon-size">1</property> </widget> </child> </widget> @@ -329,19 +362,16 @@ </packing> </child> <child> - <widget class="GtkButton" id="contact_information_button"> - <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="tooltip" translatable="yes">Show the contact's profile (Ctrl+I)</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> + <widget class="GtkToggleButton" id="video_togglebutton"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip" translatable="yes">Toggle video session</property> + <property name="relief">none</property> <child> - <widget class="GtkImage" id="image2"> + <widget class="GtkImage" id="video_image"> <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>

1 0

gajim: switch from gtk.Tooltips to gtk.Tooltip. Fixes #3471
by Yann Leboulanger 29 Oct '09

29 Oct '09

changeset 4f046069c031 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f046069c031 description: switch from gtk.Tooltips to gtk.Tooltip. Fixes #3471 diffstat: src/chat_control.py | 14 +++----------- src/dataforms_widget.py | 4 +--- src/dialogs.py | 6 +++--- src/groupchat_control.py | 8 ++------ src/vcard.py | 16 ++++++---------- 5 files changed, 15 insertions(+), 33 deletions(-) diffs (220 lines): diff -r 7fac60feb276 -r 4f046069c031 src/chat_control.py --- a/src/chat_control.py Wed Oct 28 22:18:50 2009 +0100 +++ b/src/chat_control.py Thu Oct 29 11:35:22 2009 +0100 @@ -1235,7 +1235,6 @@ # Add lock image to show chat encryption self.lock_image = self.xml.get_widget('lock_image') - self.lock_tooltip = gtk.Tooltips() # Convert to GC icon img = self.xml.get_widget('convert_to_gc_button_image') @@ -1325,8 +1324,6 @@ self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and self.session.is_loggable(), True) - self.status_tooltip = gtk.Tooltips() - self.update_ui() # restore previous conversation self.restore_conversation() @@ -1604,7 +1601,6 @@ jid = contact.jid banner_name_label = self.xml.get_widget('banner_name_label') - banner_name_tooltip = gtk.Tooltips() name = contact.get_shown_name() if self.resource: @@ -1679,8 +1675,7 @@ status_text = '%s' % (font_attrs_small, status_text) else: status_text = '%s' % (font_attrs_small, status_escaped) - self.status_tooltip.set_tip(self.banner_status_label, - status) + self.banner_status_label.set_tooltip_text(status) self.banner_status_label.show() self.banner_status_label.set_no_show_all(False) else: @@ -1691,7 +1686,7 @@ self.banner_status_label.set_markup(status_text) # setup the label that holds name and jid banner_name_label.set_markup(label_text) - banner_name_tooltip.set_tip(banner_name_label, label_tooltip) + banner_name_label.set_tooltip_text(label_tooltip) def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: @@ -1768,7 +1763,7 @@ 'status': status_string, 'authenticated': authenticated_string, 'logged': logged_string} - self.lock_tooltip.set_tip(self.authentication_button, tooltip) + self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) self.lock_image.set_sensitive(enc_enabled) @@ -2171,9 +2166,6 @@ self.reset_kbd_mouse_timeout_vars() def shutdown(self): - # destroy banner tooltip - bug #pygtk for that! - self.status_tooltip.destroy() - # Send 'gone' chatstate self.send_chatstate('gone', self.contact) self.contact.chatstate = None diff -r 7fac60feb276 -r 4f046069c031 src/dataforms_widget.py --- a/src/dataforms_widget.py Wed Oct 28 22:18:50 2009 +0100 +++ b/src/dataforms_widget.py Thu Oct 29 11:35:22 2009 +0100 @@ -283,8 +283,6 @@ self.set_col_spacings(12) self.set_row_spacings(6) - self.tooltips = gtk.Tooltips() - def decorate_with_tooltip(widget, field): ''' Adds a tooltip containing field's description to a widget. Creates EventBox if widget doesn't have its own gdk window. @@ -294,7 +292,7 @@ evbox = gtk.EventBox() evbox.add(widget) widget = evbox - self.tooltips.set_tip(widget, field.description) + widget.set_tooltip_text(field.description) return widget self._data_form = dataform diff -r 7fac60feb276 -r 4f046069c031 src/dialogs.py --- a/src/dialogs.py Wed Oct 28 22:18:50 2009 +0100 +++ b/src/dialogs.py Thu Oct 29 11:35:22 2009 +0100 @@ -344,7 +344,7 @@ item = self.xml.get_widget(category + '_image') item.set_from_pixbuf( gtkgui_helpers.load_activity_icon(category).get_pixbuf()) - gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) + item.set_tooltip_text(pep.ACTIVITIES[category]['category']) vbox = self.xml.get_widget(category + '_vbox') vbox.set_border_width(5) @@ -477,7 +477,7 @@ self.mood_buttons[mood].set_mode(False) self.mood_buttons[mood].add(gtkgui_helpers.load_mood_icon(mood)) self.mood_buttons[mood].set_relief(gtk.RELIEF_NONE) - gtk.Tooltips().set_tip(self.mood_buttons[mood], pep.MOODS[mood]) + self.mood_buttons[mood].set_tooltip_text(pep.MOODS[mood]) self.mood_buttons[mood].connect('clicked', self.on_mood_button_clicked, mood) table.attach(self.mood_buttons[mood], x, x + 1, y, y + 1) @@ -650,7 +650,7 @@ else: img.set_from_pixbuf(gtkgui_helpers.load_activity_icon( self.pep_dict['activity']).get_pixbuf()) -# gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) +# item.set_tooltip_text(pep.ACTIVITIES[category]['category']) if self.pep_dict['activity_text']: label.set_text(self.pep_dict['activity_text']) else: diff -r 7fac60feb276 -r 4f046069c031 src/groupchat_control.py --- a/src/groupchat_control.py Wed Oct 28 22:18:50 2009 +0100 +++ b/src/groupchat_control.py Thu Oct 29 11:35:22 2009 +0100 @@ -292,7 +292,6 @@ self.last_key_tabs = False self.subject = '' - self.subject_tooltip = gtk.Tooltips() self.tooltip = tooltips.GCTooltip() @@ -622,12 +621,12 @@ subject_text = '%s' % (font_attrs_small, subject) # tooltip must always hold ALL the subject - self.subject_tooltip.set_tip(self.event_box, self.subject) + self.event_box.set_tooltip_text(self.subject) self.banner_status_label.show() self.banner_status_label.set_no_show_all(False) else: subject_text = '' - self.subject_tooltip.disable() + self.event_box.set_has_tooltip(False) self.banner_status_label.hide() self.banner_status_label.set_no_show_all(True) @@ -1576,9 +1575,6 @@ del win._controls[self.account][self.contact.jid] def shutdown(self, status='offline'): - # destroy banner tooltip - bug #pygtk for that! - self.subject_tooltip.destroy() - # Preventing autorejoin from being activated self.autorejoin = False diff -r 7fac60feb276 -r 4f046069c031 src/vcard.py --- a/src/vcard.py Wed Oct 28 22:18:50 2009 +0100 +++ b/src/vcard.py Thu Oct 29 11:35:22 2009 +0100 @@ -309,12 +309,10 @@ status_label.set_max_width_chars(15) status_label.set_text(stats) - tip = gtk.Tooltips() status_label_eventbox = self.xml.get_widget('status_label_eventbox') - tip.set_tip(status_label_eventbox, stats) + status_label_eventbox.set_tooltip_text(stats) def fill_jabber_page(self): - tooltips = gtk.Tooltips() self.xml.get_widget('nickname_label').set_markup( '' + self.contact.get_shown_name() + @@ -343,7 +341,7 @@ tt_text = _("You and the contact are interested in each other's presence information") else: # None tt_text = _("You are not interested in the contact's presence, and neither he/she is interested in yours") - tooltips.set_tip(eb, tt_text) + eb.set_tooltip_text(tt_text) uf_ask = helpers.get_uf_ask(self.contact.ask) ask_label.set_text(uf_ask) @@ -352,7 +350,7 @@ tt_text = _("You are waiting contact's answer about your subscription request") else: tt_text = _("There is no pending subscription request.") - tooltips.set_tip(eb, tt_text) + eb.set_tooltip_text(tt_text) resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority)) @@ -425,7 +423,7 @@ self.xml.get_widget('resource_prio_label').set_text(resources) resource_prio_label_eventbox = self.xml.get_widget( 'resource_prio_label_eventbox') - tooltips.set_tip(resource_prio_label_eventbox, uf_resources) + resource_prio_label_eventbox.set_tooltip_text(uf_resources) self.fill_status_label() @@ -519,12 +517,10 @@ status_label.set_max_width_chars(15) status_label.set_text(stats) - tip = gtk.Tooltips() status_label_eventbox = self.xml.get_widget('status_label_eventbox') - tip.set_tip(status_label_eventbox, stats) + status_label_eventbox.set_tooltip_text(stats) def fill_contact_page(self): - tooltips = gtk.Tooltips() self.xml.get_widget('nickname_label').set_markup( '' + self.contact.get_shown_name() + @@ -545,7 +541,7 @@ self.xml.get_widget('resource_prio_label').set_text(resources) resource_prio_label_eventbox = self.xml.get_widget( 'resource_prio_label_eventbox') - tooltips.set_tip(resource_prio_label_eventbox, uf_resources) + resource_prio_label_eventbox.set_tooltip_text(uf_resources) self.fill_status_label()

1 0

gajim: update po files for 0.13 release
by Yann Leboulanger 29 Oct '09

29 Oct '09

changeset 4a3e8303cbd1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a3e8303cbd1 description: update po files for 0.13 release diffstat: po/be.po | 2988 +++++++++++++++++++++++++++------------------------- po/be(a)latin.po | 2998 ++++++++++++++++++++++++++++------------------------- po/bg.po | 2959 +++++++++++++++++++++++++++------------------------- po/br.po | 3001 +++++++++++++++++++++++++++------------------------- po/cs.po | 2943 +++++++++++++++++++++++++++------------------------ po/da.po | 2957 +++++++++++++++++++++++++++------------------------- po/de.po | 2986 ++++++++++++++++++++++++++++------------------------- po/el.po | 3008 ++++++++++++++++++++++++++++------------------------- po/en_GB.po | 3427 +++++++++++++++++++++++++++++++----------------------------- po/eo.po | 2982 +++++++++++++++++++++++++++------------------------- po/es.po | 2944 +++++++++++++++++++++++++++------------------------ po/eu.po | 2986 +++++++++++++++++++++++++++------------------------- po/fr.po | 2960 +++++++++++++++++++++++++++------------------------- po/gl.po | 2982 +++++++++++++++++++++++++++------------------------- po/hr.po | 2961 +++++++++++++++++++++++++++------------------------- po/it.po | 2973 +++++++++++++++++++++++++++------------------------- po/lt.po | 2996 ++++++++++++++++++++++++++++------------------------- po/nb.po | 2960 +++++++++++++++++++++++++++------------------------- po/nl.po | 3028 ++++++++++++++++++++++++++++------------------------- po/no.po | 2960 +++++++++++++++++++++++++++------------------------- po/pl.po | 2951 +++++++++++++++++++++++++++------------------------ po/pt.po | 3005 ++++++++++++++++++++++++++++------------------------- po/pt_BR.po | 2139 +++++++++++++++++++------------------ po/ru.po | 2951 +++++++++++++++++++++++++++------------------------ po/sk.po | 2960 +++++++++++++++++++++++++++------------------------- po/sr.po | 2962 +++++++++++++++++++++++++++------------------------- po/sr(a)Latn.po | 2964 +++++++++++++++++++++++++++------------------------- po/sv.po | 3252 ++++++++++++++++++++++++++++++--------------------------- po/uk.po | 3161 +++++++++++++++++++++++++++++-------------------------- po/zh_CN.po | 2955 +++++++++++++++++++++++++++------------------------- 30 files changed, 46801 insertions(+), 42498 deletions(-) diffs (truncated from 208302 to 300 lines): diff -r e9f103e5f0f5 -r 4a3e8303cbd1 po/be.po --- a/po/be.po Wed Oct 28 22:15:46 2009 +0100 +++ b/po/be.po Thu Oct 29 10:40:50 2009 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-19 20:36+0200\n" +"POT-Creation-Date: 2009-10-28 22:17+0100\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -220,6 +220,7 @@ #: ../data/glade/account_modification_window.glade.h:4 #: ../data/glade/accounts_window.glade.h:6 +#: ../data/glade/join_groupchat_window.glade.h:1 msgid "Account" msgstr "Рахунак" @@ -287,8 +288,8 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212 -#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217 +#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568 #: ../src/notify.py:607 ../src/notify.py:619 msgid "Gajim" msgstr "Gajim" @@ -299,8 +300,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719 -#: ../src/roster_window.py:5277 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753 +#: ../src/roster_window.py:5351 msgid "General" msgstr "Агульная" @@ -359,25 +360,21 @@ msgstr "Звесткі аб Вас, якія захоўваюцца на серверы" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547 -#: ../src/config.py:2092 +#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585 +#: ../src/config.py:2131 msgid "No key selected" msgstr "Ключ не выбраны" #. None means no proxy profile selected -#. boshuseproxy_checkbutton.set_active(False) -#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) -#. useauth_checkbutton.set_active(False) -#. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103 -#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457 -#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091 -#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106 +#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494 +#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130 +#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 -#: ../src/roster_window.py:2789 ../src/roster_window.py:2795 -#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:2807 ../src/roster_window.py:2813 +#: ../src/roster_window.py:2818 msgid "None" msgstr "Ніякі" @@ -533,8 +530,8 @@ "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571 -#: ../src/dialogs.py:784 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612 +#: ../src/dialogs.py:806 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -548,7 +545,7 @@ msgstr "_Аб'яднаць рахункі" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302 msgid "Re_name" msgstr "_Змяніць імя" @@ -810,7 +807,7 @@ msgstr "Усе станы" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:214 +#: ../src/common/commands.py:101 ../src/common/helpers.py:219 msgid "Away" msgstr "Сышоў" @@ -827,7 +824,7 @@ msgstr "Мае " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:224 +#: ../src/common/helpers.py:229 msgid "Invisible" msgstr "Нябачны" @@ -836,7 +833,7 @@ msgstr "Выканаць загад" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:197 +#: ../src/common/helpers.py:202 msgid "Not Available" msgstr "Мяне няма" @@ -1028,7 +1025,7 @@ msgstr "Удзельнічаць у _групавой размове" #: ../data/glade/chat_context_menu.glade.h:2 -#: ../data/glade/roster_contact_context_menu.glade.h:13 +#: ../data/glade/contact_context_menu.glade.h:16 #, fuzzy msgid "_Add to Roster..." msgstr "_Дадаць у кантактны ліст" @@ -1055,64 +1052,153 @@ msgid "_Start Chat" msgstr "_Пачаць размову" -#: ../data/glade/chat_control_popup_menu.glade.h:1 +#: ../data/glade/chat_to_muc_window.glade.h:1 +#, fuzzy +msgid "In_vite" +msgstr "За_прасіць" + +#: ../data/glade/chat_to_muc_window.glade.h:2 +msgid "Invite Friends!" +msgstr "" + +#: ../data/glade/chat_to_muc_window.glade.h:3 +#, fuzzy +msgid "MUC server" +msgstr "Назіральнікі" + +#: ../data/glade/chat_to_muc_window.glade.h:4 +msgid "Please select a MUC server." +msgstr "" + +#: ../data/glade/chat_to_muc_window.glade.h:5 +msgid "" +"You are going to begin a Multi-User Chat.\n" +"Select the contacts you want to invite" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:1 +msgid "A_sk to see his/her status" +msgstr "Спытацца _дазволу праглядаць змены стану" + +#: ../data/glade/contact_context_menu.glade.h:2 +#, fuzzy +msgid "Add Special _Notification..." +msgstr "Дадаць спецыяльнае _нагадванне" + +#: ../data/glade/contact_context_menu.glade.h:3 +#, fuzzy +msgid "Assign Open_PGP Key..." +msgstr "Прызначыць ключ Open_PGP" + +#: ../data/glade/contact_context_menu.glade.h:4 +#, fuzzy +msgid "E_xecute Command..." +msgstr "Выканаць загад..." + +#: ../data/glade/contact_context_menu.glade.h:5 +#, fuzzy +msgid "Edit _Groups..." +msgstr "Змяніць _групы" + +#. Invite to +#. Invite to Groupchat +#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257 +#: ../src/roster_window.py:5412 +msgid "In_vite to" +msgstr "За_прасіць" + +#: ../data/glade/contact_context_menu.glade.h:7 #, fuzzy msgid "Invite _Contacts" msgstr "Людзі" -#: ../data/glade/chat_control_popup_menu.glade.h:2 -#: ../data/glade/gc_occupants_menu.glade.h:3 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:4 -msgid "Send _File" +#: ../data/glade/contact_context_menu.glade.h:8 +#, fuzzy +msgid "Remo_ve" +msgstr "Вы_даліць" + +#. Send Custom Status +#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267 +#: ../src/roster_window.py:5497 +#, fuzzy +msgid "Send Cus_tom Status" +msgstr "Адправіць асаблівы XML" + +#: ../data/glade/contact_context_menu.glade.h:10 +msgid "Send Single _Message..." +msgstr "Адправіць _асобнае паведамленне..." + +#: ../data/glade/contact_context_menu.glade.h:11 +#, fuzzy +msgid "Send _File..." msgstr "Адправіць _файл" -#: ../data/glade/chat_control_popup_menu.glade.h:3 +#: ../data/glade/contact_context_menu.glade.h:12 +msgid "Set Custom _Avatar..." +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:13 +msgid "Start _Chat" +msgstr "Пачаць _размову" + +#: ../data/glade/contact_context_menu.glade.h:14 #, fuzzy msgid "Toggle End to End Encryption" msgstr "Пераключыць шыфраванне Open_PGP" -#: ../data/glade/chat_control_popup_menu.glade.h:4 +#: ../data/glade/contact_context_menu.glade.h:15 msgid "Toggle Open_PGP Encryption" msgstr "Пераключыць шыфраванне Open_PGP" -#: ../data/glade/chat_control_popup_menu.glade.h:5 -#: ../data/glade/gc_occupants_menu.glade.h:4 -msgid "_Add to Roster" -msgstr "_Дадаць у кантактны ліст" - -#: ../data/glade/chat_control_popup_menu.glade.h:6 +#: ../data/glade/contact_context_menu.glade.h:17 +msgid "_Allow him/her to see my status" +msgstr "Дазволіць чалавеку _бачыць змены майго стану" + +#: ../data/glade/contact_context_menu.glade.h:18 +#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330 +#: ../src/roster_window.py:5449 ../src/roster_window.py:5578 +msgid "_Block" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:19 +msgid "_Forbid him/her to see my status" +msgstr "_Забараніць праглядаць змены майго стану" + +#: ../data/glade/contact_context_menu.glade.h:20 #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 -#: ../data/glade/roster_contact_context_menu.glade.h:17 -#: ../data/glade/roster_window.glade.h:21 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5924 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647 msgid "_History" msgstr "_Журнал" -#: ../data/glade/chat_to_muc_window.glade.h:1 -#, fuzzy -msgid "In_vite" -msgstr "За_прасіць" - -#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends!" -msgstr "" - -#: ../data/glade/chat_to_muc_window.glade.h:3 -#, fuzzy -msgid "MUC server" -msgstr "Назіральнікі" - -#: ../data/glade/chat_to_muc_window.glade.h:4 -msgid "Please select a MUC server." -msgstr "" - -#: ../data/glade/chat_to_muc_window.glade.h:5 -msgid "" -"You are going to begin a Multi-User Chat.\n" -"Select the contacts you want to invite" -msgstr "" +#: ../data/glade/contact_context_menu.glade.h:21 +msgid "_Ignore" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:22

1 0

gajim: Merge default to jingle
by Thibaut GIRKA 29 Oct '09

29 Oct '09

changeset 2c459d0cb00b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c459d0cb00b description: Merge default to jingle diffstat: Makefile.am | 9 + README.html | 4 +- configure.ac | 2 +- data/glade/chat_control_popup_menu.glade | 123 - data/glade/contact_context_menu.glade | 421 +++ data/glade/roster_contact_context_menu.glade | 360 --- data/glade/zeroconf_contact_context_menu.glade | 169 - data/iconsets/crystal/16x16/away.png | data/iconsets/crystal/16x16/chat.png | data/iconsets/crystal/16x16/closed.png | data/iconsets/crystal/16x16/connecting.gif | data/iconsets/crystal/16x16/dnd.png | data/iconsets/crystal/16x16/error.png | data/iconsets/crystal/16x16/event.gif | data/iconsets/crystal/16x16/invisible.png | data/iconsets/crystal/16x16/muc_active.png | data/iconsets/crystal/16x16/muc_inactive.png | data/iconsets/crystal/16x16/not_in_roster.png | data/iconsets/crystal/16x16/offline.png | data/iconsets/crystal/16x16/online.png | data/iconsets/crystal/16x16/opened.png | data/iconsets/crystal/16x16/requested.png | data/iconsets/crystal/16x16/xa.png | data/iconsets/crystal/32x32/muc_active.png | data/iconsets/crystal/32x32/muc_inactive.png | data/iconsets/crystal/48x48/offline.png | data/iconsets/crystal/48x48/online.png | data/iconsets/gossip/16x16/away.png | data/iconsets/gossip/16x16/chat.png | data/iconsets/gossip/16x16/closed.png | data/iconsets/gossip/16x16/connecting.gif | data/iconsets/gossip/16x16/dnd.png | data/iconsets/gossip/16x16/error.png | data/iconsets/gossip/16x16/event.png | data/iconsets/gossip/16x16/invisible.png | data/iconsets/gossip/16x16/muc_active.png | data/iconsets/gossip/16x16/muc_inactive.png | data/iconsets/gossip/16x16/not_in_roster.png | data/iconsets/gossip/16x16/offline.png | data/iconsets/gossip/16x16/online.png | data/iconsets/gossip/16x16/opened.png | data/iconsets/gossip/16x16/requested.png | data/iconsets/gossip/16x16/xa.png | data/iconsets/gossip/32x32/muc_active.png | data/iconsets/gossip/32x32/muc_inactive.png | data/iconsets/gossip/48x48/offline.png | data/iconsets/gossip/48x48/online.png | data/iconsets/nuvola/16x16/away.png | data/iconsets/nuvola/16x16/chat.png | data/iconsets/nuvola/16x16/closed.png | data/iconsets/nuvola/16x16/connecting.png | data/iconsets/nuvola/16x16/dnd.png | data/iconsets/nuvola/16x16/error.png | data/iconsets/nuvola/16x16/event.gif | data/iconsets/nuvola/16x16/invisible.png | data/iconsets/nuvola/16x16/muc_active.png | data/iconsets/nuvola/16x16/muc_inactive.png | data/iconsets/nuvola/16x16/not_in_roster.png | data/iconsets/nuvola/16x16/offline.png | data/iconsets/nuvola/16x16/online.png | data/iconsets/nuvola/16x16/opened.png | data/iconsets/nuvola/16x16/requested.png | data/iconsets/nuvola/16x16/xa.png | data/iconsets/nuvola/32x32/muc_active.png | data/iconsets/nuvola/32x32/muc_inactive.png | data/iconsets/nuvola/48x48/offline.png | data/iconsets/nuvola/48x48/online.png | data/iconsets/simplebulb/16x16/away.png | data/iconsets/simplebulb/16x16/chat.png | data/iconsets/simplebulb/16x16/closed.png | data/iconsets/simplebulb/16x16/connecting.png | data/iconsets/simplebulb/16x16/dnd.png | data/iconsets/simplebulb/16x16/error.png | data/iconsets/simplebulb/16x16/event.png | data/iconsets/simplebulb/16x16/invisible.png | data/iconsets/simplebulb/16x16/muc_active.png | data/iconsets/simplebulb/16x16/muc_inactive.png | data/iconsets/simplebulb/16x16/not_in_roster.png | data/iconsets/simplebulb/16x16/offline.png | data/iconsets/simplebulb/16x16/online.png | data/iconsets/simplebulb/16x16/opened.png | data/iconsets/simplebulb/16x16/requested.png | data/iconsets/simplebulb/16x16/xa.png | data/iconsets/simplebulb/32x32/muc_active.png | data/iconsets/simplebulb/32x32/muc_inactive.png | data/iconsets/simplebulb/48x48/offline.png | data/iconsets/simplebulb/48x48/online.png | data/iconsets/stellar/16x16/away.png | data/iconsets/stellar/16x16/chat.png | data/iconsets/stellar/16x16/closed.png | data/iconsets/stellar/16x16/connecting.gif | data/iconsets/stellar/16x16/dnd.png | data/iconsets/stellar/16x16/error.png | data/iconsets/stellar/16x16/event.gif | data/iconsets/stellar/16x16/invisible.png | data/iconsets/stellar/16x16/muc_active.png | data/iconsets/stellar/16x16/muc_inactive.png | data/iconsets/stellar/16x16/not_in_roster.png | data/iconsets/stellar/16x16/offline.png | data/iconsets/stellar/16x16/online.png | data/iconsets/stellar/16x16/opened.png | data/iconsets/stellar/16x16/requested.png | data/iconsets/stellar/16x16/xa.png | data/iconsets/stellar/32x32/muc_active.png | data/iconsets/stellar/32x32/muc_inactive.png | data/iconsets/stellar/48x48/offline.png | data/iconsets/stellar/48x48/online.png | doc/epydoc.conf | 29 + epydoc.conf | 29 - gajim.nsi | 30 - po/be.po | 2988 ++++++++++++++------------- po/be(a)latin.po | 2998 ++++++++++++++------------- po/bg.po | 2959 ++++++++++++++------------ po/br.po | 3001 ++++++++++++++------------- po/cs.po | 2943 ++++++++++++++------------ po/da.po | 2957 ++++++++++++++------------ po/de.po | 2994 ++++++++++++++------------- po/el.po | 3008 ++++++++++++++------------- po/en_GB.po | 2958 ++++++++++++++------------ po/eo.po | 2982 ++++++++++++++------------- po/es.po | 2944 ++++++++++++++------------ po/eu.po | 2986 ++++++++++++++------------- po/fr.po | 2962 ++++++++++++++------------ po/gl.po | 2982 ++++++++++++++------------- po/hr.po | 2961 ++++++++++++++------------ po/it.po | 2973 ++++++++++++++------------ po/lt.po | 2996 ++++++++++++++------------- po/nb.po | 2960 ++++++++++++++------------ po/nl.po | 3028 ++++++++++++++------------- po/no.po | 2960 ++++++++++++++------------ po/pl.po | 2951 ++++++++++++++------------ po/pt.po | 3005 ++++++++++++++------------- po/pt_BR.po | 2139 ++++++++++--------- po/ru.po | 2951 ++++++++++++++------------ po/sk.po | 2960 ++++++++++++++------------ po/sr.po | 2962 ++++++++++++++------------ po/sr(a)Latn.po | 2964 ++++++++++++++------------ po/sv.po | 2959 ++++++++++++++------------ po/uk.po | 2963 ++++++++++++++------------ po/zh_CN.po | 2955 ++++++++++++++------------ scripts/dev/run-build-test.py | 22 + scripts/dev/run-pychecker.py | 14 - scripts/dev/run-pylint.py | 13 + src/advanced.py | 296 -- src/advanced_configuration_window.py | 288 ++ src/chat_control.py | 143 +- src/command_system/implementation/standard.py | 2 +- src/common/config.py | 1 + src/common/connection.py | 7 +- src/common/connection_handlers.py | 13 +- src/common/defs.py | 2 +- src/common/helpers.py | 4 +- src/common/optparser.py | 17 + src/common/zeroconf/client_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 4 +- src/config.py | 8 +- src/dialogs.py | 100 +- src/gajim.py | 50 +- src/groupchat_control.py | 50 +- src/gui_menu_builder.py | 466 ++++ src/message_control.py | 2 +- src/message_window.py | 29 + src/roster_window.py | 552 +---- src/systray.py | 2 +- 164 files changed, 47874 insertions(+), 43746 deletions(-) diffs (truncated from 211391 to 300 lines): diff -r a4cc02820b66 -r 2c459d0cb00b Makefile.am --- a/Makefile.am Thu Oct 29 10:08:22 2009 +0100 +++ b/Makefile.am Thu Oct 29 10:19:58 2009 +0100 @@ -57,3 +57,12 @@ autom4te.cache \ build \ dist + + +test: + python test/runtests.py +.PHONY: test + +doc: + epydoc --config=doc/epydoc.conf +.PHONY: doc diff -r a4cc02820b66 -r 2c459d0cb00b README.html --- a/README.html Thu Oct 29 10:08:22 2009 +0100 +++ b/README.html Thu Oct 29 10:19:58 2009 +0100 @@ -37,8 +37,8 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> -<li>python-dbus bindings</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> +<li>python-dbus bindings (>=0.80)</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul> diff -r a4cc02820b66 -r 2c459d0cb00b configure.ac --- a/configure.ac Thu Oct 29 10:08:22 2009 +0100 +++ b/configure.ac Thu Oct 29 10:19:58 2009 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.5.6-dev],[http://trac.gajim.org/],[gajim]) + [0.12.5.7-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r a4cc02820b66 -r 2c459d0cb00b data/glade/chat_control_popup_menu.glade --- a/data/glade/chat_control_popup_menu.glade Thu Oct 29 10:08:22 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -<?xml version="1.0"?> -<glade-interface> -  -  - <widget class="GtkMenu" id="chat_control_popup_menu"> - <child> - <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label">_Add to Roster</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <signal name="activate" handler="_on_add_to_roster_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="stock">gtk-add</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="label">Send _File</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <signal name="activate" handler="_on_send_file_menuitem_activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-save</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="convert_to_groupchat"> - <property name="label">Invite _Contacts</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_gpg_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="start_voip_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Start _Voice chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_start_voip_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="stop_voip_menuitem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Stop _Voice chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_stop_voip_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="toggle_e2e_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">Toggle End to End Encryption</property> - <property name="use_underline">True</property> - <signal name="activate" handler="_on_toggle_e2e_menuitem_activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="information_menuitem"> - <property name="label">gtk-info</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="history_menuitem"> - <property name="label">_History</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="use_stock">False</property> - <child internal-child="image"> - <widget class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-justify-fill</property> - <property name="icon-size">1</property> - </widget> - </child> - </widget> - </child> - </widget> -</glade-interface> diff -r a4cc02820b66 -r 2c459d0cb00b data/glade/contact_context_menu.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/contact_context_menu.glade Thu Oct 29 10:19:58 2009 +0100 @@ -0,0 +1,421 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkMenu" id="contact_context_menu"> + <child> + <widget class="GtkImageMenuItem" id="start_chat_menuitem"> + <property name="label" translatable="yes">Start _Chat</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-jump-to</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_single_message_menuitem"> + <property name="label" translatable="yes">Send Single _Message...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="stock">gtk-new</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_file_menuitem"> + <property name="label" translatable="yes">Send _File...</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-save</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="invite_menuitem"> + <property name="label" translatable="yes">In_vite to</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="convert_to_groupchat_menuitem"> + <property name="label" translatable="yes">Invite _Contacts</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child internal-child="image"> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="encryption_separator"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_gpg_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle Open_PGP Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkCheckMenuItem" id="toggle_e2e_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Toggle End to End Encryption</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkSeparatorMenuItem" id="menuitem3"> + <property name="visible">True</property> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> + <property name="label" translatable="yes">Send Cus_tom Status</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + <child> + <widget class="GtkMenu" id="menu5"> + <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> + </widget> + </child> + <child internal-child="image"> + <widget class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon-size">1</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkImageMenuItem" id="execute_command_menuitem"> + <property name="label" translatable="yes">E_xecute Command...</property> + <property name="visible">True</property>

1 0

gajim: Avoid insane recursion
by Thibaut GIRKA 29 Oct '09

29 Oct '09

changeset a4cc02820b66 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a4cc02820b66 description: Avoid insane recursion diffstat: src/chat_control.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r dba1920bc533 -r a4cc02820b66 src/chat_control.py --- a/src/chat_control.py Fri Oct 16 21:48:28 2009 +0200 +++ b/src/chat_control.py Thu Oct 29 10:08:22 2009 +0100 @@ -1594,7 +1594,10 @@ 'error': self.JINGLE_STATE_ERROR} if state in states: - self.__dict__[jingle_type + '_state'] = states[state] + jingle_state = states[state] + if self.__dict__[jingle_type + '_state'] == jingle_state: + return + self.__dict__[jingle_type + '_state'] = jingle_state # Destroy existing session with the user when he signs off # We need to do that before modifying the sid

1 0

gajim: update po files for translation
by Yann Leboulanger 28 Oct '09

28 Oct '09

changeset 7fac60feb276 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7fac60feb276 description: update po files for translation diffstat: po/be.po | 2988 +++++++++++++++++++++++++++++++----------------------------- po/be(a)latin.po | 2998 ++++++++++++++++++++++++++++++++----------------------------- po/bg.po | 2959 +++++++++++++++++++++++++++++++---------------------------- po/br.po | 3001 +++++++++++++++++++++++++++++++----------------------------- po/cs.po | 2943 +++++++++++++++++++++++++++++++---------------------------- po/da.po | 2957 +++++++++++++++++++++++++++++++---------------------------- po/de.po | 2986 ++++++++++++++++++++++++++++++++---------------------------- po/el.po | 3008 ++++++++++++++++++++++++++++++++----------------------------- po/en_GB.po | 2958 +++++++++++++++++++++++++++++++---------------------------- po/eo.po | 2982 +++++++++++++++++++++++++++++++---------------------------- po/es.po | 2944 +++++++++++++++++++++++++++++++---------------------------- po/eu.po | 2986 +++++++++++++++++++++++++++++++---------------------------- po/fr.po | 2960 +++++++++++++++++++++++++++++++---------------------------- po/gl.po | 2982 +++++++++++++++++++++++++++++++---------------------------- po/hr.po | 2961 +++++++++++++++++++++++++++++++---------------------------- po/it.po | 2973 +++++++++++++++++++++++++++++++---------------------------- po/lt.po | 2996 ++++++++++++++++++++++++++++++++----------------------------- po/nb.po | 2960 +++++++++++++++++++++++++++++++---------------------------- po/nl.po | 3028 ++++++++++++++++++++++++++++++++----------------------------- po/no.po | 2960 +++++++++++++++++++++++++++++++---------------------------- po/pl.po | 2951 +++++++++++++++++++++++++++++++---------------------------- po/pt.po | 3005 ++++++++++++++++++++++++++++++++----------------------------- po/pt_BR.po | 2139 ++++++++++++++++++++++--------------------- po/ru.po | 2951 +++++++++++++++++++++++++++++++---------------------------- po/sk.po | 2960 +++++++++++++++++++++++++++++++---------------------------- po/sr.po | 2962 +++++++++++++++++++++++++++++++---------------------------- po/sr(a)Latn.po | 2964 +++++++++++++++++++++++++++++++---------------------------- po/sv.po | 2959 +++++++++++++++++++++++++++++++---------------------------- po/uk.po | 2963 +++++++++++++++++++++++++++++++---------------------------- po/zh_CN.po | 2955 +++++++++++++++++++++++++++++++---------------------------- 30 files changed, 46355 insertions(+), 41984 deletions(-) diffs (truncated from 207194 to 300 lines): diff -r 3907823ac427 -r 7fac60feb276 po/be.po --- a/po/be.po Wed Oct 28 22:15:46 2009 +0100 +++ b/po/be.po Wed Oct 28 22:18:50 2009 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-19 20:36+0200\n" +"POT-Creation-Date: 2009-10-28 22:17+0100\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -220,6 +220,7 @@ #: ../data/glade/account_modification_window.glade.h:4 #: ../data/glade/accounts_window.glade.h:6 +#: ../data/glade/join_groupchat_window.glade.h:1 msgid "Account" msgstr "Рахунак" @@ -287,8 +288,8 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212 -#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217 +#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568 #: ../src/notify.py:607 ../src/notify.py:619 msgid "Gajim" msgstr "Gajim" @@ -299,8 +300,8 @@ #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:22 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98 -#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719 -#: ../src/roster_window.py:5277 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753 +#: ../src/roster_window.py:5351 msgid "General" msgstr "Агульная" @@ -359,25 +360,21 @@ msgstr "Звесткі аб Вас, якія захоўваюцца на серверы" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547 -#: ../src/config.py:2092 +#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585 +#: ../src/config.py:2131 msgid "No key selected" msgstr "Ключ не выбраны" #. None means no proxy profile selected -#. boshuseproxy_checkbutton.set_active(False) -#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton) -#. useauth_checkbutton.set_active(False) -#. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:37 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103 -#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457 -#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091 -#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106 +#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494 +#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130 +#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 -#: ../src/roster_window.py:2789 ../src/roster_window.py:2795 -#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:2807 ../src/roster_window.py:2813 +#: ../src/roster_window.py:2818 msgid "None" msgstr "Ніякі" @@ -533,8 +530,8 @@ "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола." #: ../data/glade/accounts_window.glade.h:32 -#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571 -#: ../src/dialogs.py:784 +#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612 +#: ../src/dialogs.py:806 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -548,7 +545,7 @@ msgstr "_Аб'яднаць рахункі" #. Rename -#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228 +#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302 msgid "Re_name" msgstr "_Змяніць імя" @@ -810,7 +807,7 @@ msgstr "Усе станы" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/commands.py:101 ../src/common/helpers.py:214 +#: ../src/common/commands.py:101 ../src/common/helpers.py:219 msgid "Away" msgstr "Сышоў" @@ -827,7 +824,7 @@ msgstr "Мае " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:224 +#: ../src/common/helpers.py:229 msgid "Invisible" msgstr "Нябачны" @@ -836,7 +833,7 @@ msgstr "Выканаць загад" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:197 +#: ../src/common/helpers.py:202 msgid "Not Available" msgstr "Мяне няма" @@ -1028,7 +1025,7 @@ msgstr "Удзельнічаць у _групавой размове" #: ../data/glade/chat_context_menu.glade.h:2 -#: ../data/glade/roster_contact_context_menu.glade.h:13 +#: ../data/glade/contact_context_menu.glade.h:16 #, fuzzy msgid "_Add to Roster..." msgstr "_Дадаць у кантактны ліст" @@ -1055,64 +1052,153 @@ msgid "_Start Chat" msgstr "_Пачаць размову" -#: ../data/glade/chat_control_popup_menu.glade.h:1 +#: ../data/glade/chat_to_muc_window.glade.h:1 +#, fuzzy +msgid "In_vite" +msgstr "За_прасіць" + +#: ../data/glade/chat_to_muc_window.glade.h:2 +msgid "Invite Friends!" +msgstr "" + +#: ../data/glade/chat_to_muc_window.glade.h:3 +#, fuzzy +msgid "MUC server" +msgstr "Назіральнікі" + +#: ../data/glade/chat_to_muc_window.glade.h:4 +msgid "Please select a MUC server." +msgstr "" + +#: ../data/glade/chat_to_muc_window.glade.h:5 +msgid "" +"You are going to begin a Multi-User Chat.\n" +"Select the contacts you want to invite" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:1 +msgid "A_sk to see his/her status" +msgstr "Спытацца _дазволу праглядаць змены стану" + +#: ../data/glade/contact_context_menu.glade.h:2 +#, fuzzy +msgid "Add Special _Notification..." +msgstr "Дадаць спецыяльнае _нагадванне" + +#: ../data/glade/contact_context_menu.glade.h:3 +#, fuzzy +msgid "Assign Open_PGP Key..." +msgstr "Прызначыць ключ Open_PGP" + +#: ../data/glade/contact_context_menu.glade.h:4 +#, fuzzy +msgid "E_xecute Command..." +msgstr "Выканаць загад..." + +#: ../data/glade/contact_context_menu.glade.h:5 +#, fuzzy +msgid "Edit _Groups..." +msgstr "Змяніць _групы" + +#. Invite to +#. Invite to Groupchat +#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257 +#: ../src/roster_window.py:5412 +msgid "In_vite to" +msgstr "За_прасіць" + +#: ../data/glade/contact_context_menu.glade.h:7 #, fuzzy msgid "Invite _Contacts" msgstr "Людзі" -#: ../data/glade/chat_control_popup_menu.glade.h:2 -#: ../data/glade/gc_occupants_menu.glade.h:3 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:4 -msgid "Send _File" +#: ../data/glade/contact_context_menu.glade.h:8 +#, fuzzy +msgid "Remo_ve" +msgstr "Вы_даліць" + +#. Send Custom Status +#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267 +#: ../src/roster_window.py:5497 +#, fuzzy +msgid "Send Cus_tom Status" +msgstr "Адправіць асаблівы XML" + +#: ../data/glade/contact_context_menu.glade.h:10 +msgid "Send Single _Message..." +msgstr "Адправіць _асобнае паведамленне..." + +#: ../data/glade/contact_context_menu.glade.h:11 +#, fuzzy +msgid "Send _File..." msgstr "Адправіць _файл" -#: ../data/glade/chat_control_popup_menu.glade.h:3 +#: ../data/glade/contact_context_menu.glade.h:12 +msgid "Set Custom _Avatar..." +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:13 +msgid "Start _Chat" +msgstr "Пачаць _размову" + +#: ../data/glade/contact_context_menu.glade.h:14 #, fuzzy msgid "Toggle End to End Encryption" msgstr "Пераключыць шыфраванне Open_PGP" -#: ../data/glade/chat_control_popup_menu.glade.h:4 +#: ../data/glade/contact_context_menu.glade.h:15 msgid "Toggle Open_PGP Encryption" msgstr "Пераключыць шыфраванне Open_PGP" -#: ../data/glade/chat_control_popup_menu.glade.h:5 -#: ../data/glade/gc_occupants_menu.glade.h:4 -msgid "_Add to Roster" -msgstr "_Дадаць у кантактны ліст" - -#: ../data/glade/chat_control_popup_menu.glade.h:6 +#: ../data/glade/contact_context_menu.glade.h:17 +msgid "_Allow him/her to see my status" +msgstr "Дазволіць чалавеку _бачыць змены майго стану" + +#: ../data/glade/contact_context_menu.glade.h:18 +#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330 +#: ../src/roster_window.py:5449 ../src/roster_window.py:5578 +msgid "_Block" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:19 +msgid "_Forbid him/her to see my status" +msgstr "_Забараніць праглядаць змены майго стану" + +#: ../data/glade/contact_context_menu.glade.h:20 #: ../data/glade/gc_control_popup_menu.glade.h:6 #: ../data/glade/gc_occupants_menu.glade.h:8 -#: ../data/glade/roster_contact_context_menu.glade.h:17 -#: ../data/glade/roster_window.glade.h:21 -#: ../data/glade/zeroconf_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:5924 +#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647 msgid "_History" msgstr "_Журнал" -#: ../data/glade/chat_to_muc_window.glade.h:1 -#, fuzzy -msgid "In_vite" -msgstr "За_прасіць" - -#: ../data/glade/chat_to_muc_window.glade.h:2 -msgid "Invite Friends!" -msgstr "" - -#: ../data/glade/chat_to_muc_window.glade.h:3 -#, fuzzy -msgid "MUC server" -msgstr "Назіральнікі" - -#: ../data/glade/chat_to_muc_window.glade.h:4 -msgid "Please select a MUC server." -msgstr "" - -#: ../data/glade/chat_to_muc_window.glade.h:5 -msgid "" -"You are going to begin a Multi-User Chat.\n" -"Select the contacts you want to invite" -msgstr "" +#: ../data/glade/contact_context_menu.glade.h:21 +msgid "_Ignore" +msgstr "" + +#: ../data/glade/contact_context_menu.glade.h:22

1 0

gajim: fix traceback with bash completion
by Yann Leboulanger 28 Oct '09

28 Oct '09

changeset 3907823ac427 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3907823ac427 description: fix traceback with bash completion diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 8b8b18582724 -r 3907823ac427 src/groupchat_control.py --- a/src/groupchat_control.py Wed Oct 28 20:03:45 2009 +0100 +++ b/src/groupchat_control.py Wed Oct 28 22:15:46 2009 +0100 @@ -1844,8 +1844,8 @@ else: add = ' ' start_iter = end_iter.copy() - if self.last_key_tabs and with_refer_to_nick_char or \ - text[-1] == ' ': + if self.last_key_tabs and with_refer_to_nick_char or (text and \ + text[-1] == ' '): # have to accomodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char!

1 0

gajim: fix traceback with bash completion
by Yann Leboulanger 28 Oct '09

28 Oct '09

changeset e9f103e5f0f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9f103e5f0f5 description: fix traceback with bash completion diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2c8105e20e2b -r e9f103e5f0f5 src/groupchat_control.py --- a/src/groupchat_control.py Wed Oct 28 21:17:23 2009 +0100 +++ b/src/groupchat_control.py Wed Oct 28 22:15:46 2009 +0100 @@ -1844,8 +1844,8 @@ else: add = ' ' start_iter = end_iter.copy() - if self.last_key_tabs and with_refer_to_nick_char or \ - text[-1] == ' ': + if self.last_key_tabs and with_refer_to_nick_char or (text and \ + text[-1] == ' '): # have to accomodate for the added space from last # completion # gc_refer_to_nick_char may be more than one char!

1 0

gajim: create branch for 0.13 versions
by Yann Leboulanger 28 Oct '09

28 Oct '09

changeset 2c8105e20e2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c8105e20e2b description: create branch for 0.13 versions

1 0

gajim: prevent a traceback which happen with obscure reasons. Fi...
by Yann Leboulanger 28 Oct '09

28 Oct '09

changeset 8b8b18582724 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b8b18582724 description: prevent a traceback which happen with obscure reasons. Fixes #5366 diffstat: src/message_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 9eb8ab239bde -r 8b8b18582724 src/message_window.py --- a/src/message_window.py Wed Oct 28 15:43:05 2009 +0100 +++ b/src/message_window.py Wed Oct 28 20:03:45 2009 +0100 @@ -764,6 +764,9 @@ old_ctrl.set_control_active(False) new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) + if not new_ctrl: + # This event is sometimes exposed without any reason. see #5366 + return new_ctrl.set_control_active(True) self.show_title(control = new_ctrl)

1 0

← Newer
1
2
3
4
5
6
7
...
18
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 October 2009