Commits May 2010

commits@gajim.org

6 participants
37 discussions

gajim: branche for jingle file transfer
by fantasticsid＠lagaule.org 24 May '10

24 May '10

changeset e18788a1300e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e18788a1300e description: branche for jingle file transfer

1 0

gajim: move "Do not ask me again" accelerator to D. Fixes #5755
by Yann Leboulanger 21 May '10

21 May '10

changeset d2883c425849 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2883c425849 description: move "Do not ask me again" accelerator to D. Fixes #5755 diffstat: src/groupchat_control.py | 2 +- src/gui_interface.py | 8 ++++---- src/message_window.py | 2 +- src/roster_window.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diffs (93 lines): diff -r 85dc199c2ab1 -r d2883c425849 src/groupchat_control.py --- a/src/groupchat_control.py Thu May 20 20:51:07 2010 +0200 +++ b/src/groupchat_control.py Fri May 21 09:38:09 2010 +0200 @@ -1723,7 +1723,7 @@ 'from this group chat.') dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again'), on_response_ok=on_ok, + _('_Do not ask me again'), on_response_ok=on_ok, on_response_cancel=on_cancel) return diff -r 85dc199c2ab1 -r d2883c425849 src/gui_interface.py --- a/src/gui_interface.py Thu May 20 20:51:07 2010 +0200 +++ b/src/gui_interface.py Fri May 21 09:38:09 2010 +0200 @@ -1211,7 +1211,7 @@ dialogs.YesNoDialog(_('GPG key not trusted'), _('The GPG key used to ' 'encrypt this chat is not trusted. Do you really want to encrypt ' - 'this message?'), checktext=_('Do _not ask me again'), + 'this message?'), checktext=_('_Do not ask me again'), on_response_yes=on_yes, on_response_no=on_no) def handle_event_password_required(self, account, array): @@ -1983,7 +1983,7 @@ 'connection. This means all your conversations will be ' 'exchanged unencrypted. Are you sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('Do _not ask me again') + checktext2 = _('_Do not ask me again') if 'plain_connection' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['plain_connection'].\ destroy() @@ -2020,7 +2020,7 @@ 'connection. You should install PyOpenSSL to prevent that. Are you ' 'sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('Do _not ask me again') + checktext2 = _('_Do not ask me again') if 'insecure_ssl' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['insecure_ssl'].destroy() self.instances[account]['online_dialog']['insecure_ssl'] = \ @@ -2055,7 +2055,7 @@ sectext = _('You are about to send your password unencrypted on an ' 'insecure connection. Are you sure you want to do that?') checktext1 = _('Yes, I really want to connect insecurely') - checktext2 = _('Do _not ask me again') + checktext2 = _('_Do not ask me again') if 'insecure_password' in self.instances[account]['online_dialog']: self.instances[account]['online_dialog']['insecure_password'].\ destroy() diff -r 85dc199c2ab1 -r d2883c425849 src/message_window.py --- a/src/message_window.py Thu May 20 20:51:07 2010 +0200 +++ b/src/message_window.py Fri May 21 09:38:09 2010 +0200 @@ -219,7 +219,7 @@ dialogs.YesNoDialog( _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('Do _not ask me again'), on_response_yes=on_yes1) + checktext=_('_Do not ask me again'), on_response_yes=on_yes1) return True def on_yes(ctrl): diff -r 85dc199c2ab1 -r d2883c425849 src/roster_window.py --- a/src/roster_window.py Thu May 20 20:51:07 2010 +0200 +++ b/src/roster_window.py Fri May 21 09:38:09 2010 +0200 @@ -2733,7 +2733,7 @@ sectext = _('This contact will see you offline and you will not ' 'receive messages he will send you.') dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again'), on_response_ok=_block_it) + _('_Do not ask me again'), on_response_ok=_block_it) def on_unblock(self, widget, list_, group=None): """ @@ -3393,7 +3393,7 @@ 'but only until you change your status. Then he or she will see ' 'your global status.') % {'status': show} dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again'), on_response_ok=send_it) + _('_Do not ask me again'), on_response_ok=send_it) def on_status_combobox_changed(self, widget): """ @@ -4117,7 +4117,7 @@ 'line. Generally it is used when the same person has several ' 'Jabber accounts or transport accounts.') dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, - _('Do _not ask me again'), on_response_ok=merge_contacts) + _('_Do not ask me again'), on_response_ok=merge_contacts) if not confirm_metacontacts: # First time we see this window dlg.checkbutton.set_active(True)

1 0

gajim: uncomment lines commented for tests
by Yann Leboulanger 20 May '10

20 May '10

changeset 85dc199c2ab1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=85dc199c2ab1 description: uncomment lines commented for tests diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r fca055edb0ab -r 85dc199c2ab1 src/groupchat_control.py --- a/src/groupchat_control.py Thu May 20 18:45:09 2010 +0200 +++ b/src/groupchat_control.py Thu May 20 20:51:07 2010 +0200 @@ -1266,8 +1266,8 @@ '%(reason)s') % { 'nick': nick, 'who': actor, 'reason': reason } self.print_conversation(s, 'info', tim=tim, graphics=False) -# if nick == self.nick: -# self.autorejoin = False + if nick == self.nick: + self.autorejoin = False elif '303' in statusCode: # Someone changed his or her nick if new_nick == self.new_nick or nick == self.nick: # We changed our nick

1 0

gajim: don't show more than one error dialog for a given groupch...
by Yann Leboulanger 20 May '10

20 May '10

changeset fca055edb0ab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fca055edb0ab description: don't show more than one error dialog for a given groupchat. Fixes #5753 diffstat: src/common/connection_handlers.py | 36 +++++++++++++++++++++--------------- src/dialogs.py | 17 ++++++++++------- src/groupchat_control.py | 7 +++++-- src/gui_interface.py | 15 +++++++++++++++ 4 files changed, 51 insertions(+), 24 deletions(-) diffs (155 lines): diff -r 0459c47e1eb0 -r fca055edb0ab src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu May 20 09:17:56 2010 +0200 +++ b/src/common/connection_handlers.py Thu May 20 18:45:09 2010 +0200 @@ -1784,33 +1784,39 @@ elif (errcode == '503'): if gc_control is None or gc_control.autorejoin is None: # maximum user number reached - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Maximum number of users for %s has been reached') % \ - room_jid)) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('Maximum number of users for %s has been ' + 'reached') % room_jid)) elif (errcode == '401') or (errcon == 'not-authorized'): # password required to join self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick)) elif (errcode == '403') or (errcon == 'forbidden'): # we are banned - self.dispatch('ERROR', (_('Unable to join group chat'), - _('You are banned from group chat %s.') % room_jid)) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('You are banned from group chat %s.') % room_jid)) elif (errcode == '404') or (errcon in ('item-not-found', 'remote-server-not-found')): if gc_control is None or gc_control.autorejoin is None: # group chat does not exist - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Group chat %s does not exist.') % room_jid)) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('Group chat %s does not exist.') % room_jid)) elif (errcode == '405') or (errcon == 'not-allowed'): - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Group chat creation is restricted.'))) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('Group chat creation is restricted.'))) elif (errcode == '406') or (errcon == 'not-acceptable'): - self.dispatch('ERROR', (_('Unable to join group chat'), - _('Your registered nickname must be used in group chat %s.') \ - % room_jid)) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('Your registered nickname must be used in group chat ' + '%s.') % room_jid)) elif (errcode == '407') or (errcon == 'registration-required'): - self.dispatch('ERROR', (_('Unable to join group chat'), - _('You are not in the members list in groupchat %s.') % \ - room_jid)) + self.dispatch('GC_ERROR', (gc_control, + _('Unable to join group chat'), + _('You are not in the members list in groupchat %s.') %\ + room_jid)) elif (errcode == '409') or (errcon == 'conflict'): # nick conflict room_jid = gajim.get_room_from_fjid(who) diff -r 0459c47e1eb0 -r fca055edb0ab src/dialogs.py --- a/src/dialogs.py Thu May 20 09:17:56 2010 +0200 +++ b/src/dialogs.py Thu May 20 18:45:09 2010 +0200 @@ -1242,8 +1242,9 @@ class Dialog(gtk.Dialog): def __init__(self, parent, title, buttons, default=None, - on_response_ok=None, on_response_cancel=None): - gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR) + on_response_ok=None, on_response_cancel=None): + gtk.Dialog.__init__(self, title, parent, + gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_NO_SEPARATOR) self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel @@ -1480,8 +1481,8 @@ """ def __init__(self, pritext, sectext=''): - HigDialog.__init__(self, None, - gtk.MESSAGE_INFO, gtk.BUTTONS_OK, pritext, sectext) + HigDialog.__init__(self, None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, + pritext, sectext) self.set_modal(False) self.set_transient_for(gajim.interface.roster.window) self.popup() @@ -1491,9 +1492,11 @@ HIG compliant error dialog """ - def __init__(self, pritext, sectext=''): - HigDialog.__init__( self, None, - gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, pritext, sectext) + def __init__(self, pritext, sectext='', on_response_ok=None, + on_response_cancel=None): + HigDialog.__init__( self, None, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, + pritext, sectext, on_response_ok=on_response_ok, + on_response_cancel=on_response_cancel) self.popup() class YesNoDialog(HigDialog): diff -r 0459c47e1eb0 -r fca055edb0ab src/groupchat_control.py --- a/src/groupchat_control.py Thu May 20 09:17:56 2010 +0200 +++ b/src/groupchat_control.py Thu May 20 18:45:09 2010 +0200 @@ -216,6 +216,9 @@ # state in got_connected()). self.autorejoin = None + # Keep error dialog instance to be sure to have only once at a time + self.error_dialog = None + self.actions_button = self.xml.get_object('muc_window_actions_button') id_ = self.actions_button.connect('clicked', self.on_actions_button_clicked) @@ -1263,8 +1266,8 @@ '%(reason)s') % { 'nick': nick, 'who': actor, 'reason': reason } self.print_conversation(s, 'info', tim=tim, graphics=False) - if nick == self.nick: - self.autorejoin = False +# if nick == self.nick: +# self.autorejoin = False elif '303' in statusCode: # Someone changed his or her nick if new_nick == self.new_nick or nick == self.nick: # We changed our nick diff -r 0459c47e1eb0 -r fca055edb0ab src/gui_interface.py --- a/src/gui_interface.py Thu May 20 09:17:56 2010 +0200 +++ b/src/gui_interface.py Thu May 20 18:45:09 2010 +0200 @@ -1151,6 +1151,20 @@ notify.popup(event_type, jid, account, 'gc-invitation', path, event_type, room_jid) + def handle_event_gc_error(self, account, data): + #('ERROR', account, (gc_control, title_text, section_text)) + gc_control, pritext, sectext = data + if gc_control: + if gc_control.error_dialog: + gc_control.error_dialog.destroy() + def on_close(dummy): + gc_control.error_dialog.destroy() + gc_control.error_dialog = None + gc_control.error_dialog = dialogs.ErrorDialog(pritext, sectext, + on_response_ok=on_close, on_response_cancel=on_close) + else: + dialogs.ErrorDialog(pritext, sectext) + def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase: del self.gpg_passphrase[keyid] @@ -2126,6 +2140,7 @@ 'GC_INVITATION': [self.handle_event_gc_invitation], 'GC_AFFILIATION': [self.handle_event_gc_affiliation], 'GC_PASSWORD_REQUIRED': [self.handle_event_gc_password_required], + 'GC_ERROR': [self.handle_event_gc_error], 'BAD_PASSPHRASE': [self.handle_event_bad_passphrase], 'ROSTER_INFO': [self.handle_event_roster_info], 'BOOKMARKS': [self.handle_event_bookmarks],

1 0

gajim: fix indentation and 80 char width
by Yann Leboulanger 20 May '10

20 May '10

changeset 0459c47e1eb0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0459c47e1eb0 description: fix indentation and 80 char width diffstat: src/groupchat_control.py | 473 +++++++++++++++++++++++++--------------------- 1 files changed, 252 insertions(+), 221 deletions(-) diffs (truncated from 1259 to 300 lines): diff -r cfaa58dd8bfc -r 0459c47e1eb0 src/groupchat_control.py --- a/src/groupchat_control.py Wed May 12 10:18:52 2010 +0200 +++ b/src/groupchat_control.py Thu May 20 09:17:56 2010 +0200 @@ -86,9 +86,11 @@ renderer.set_property('xalign', 1) # align pixbuf to the right else: renderer.set_property('xalign', 0.5) - if parent_iter and (model[iter_][C_AVATAR] or avatar_position == 'left'): + if parent_iter and (model[iter_][C_AVATAR] or avatar_position == \ + 'left'): renderer.set_property('visible', True) - renderer.set_property('width', gajim.config.get('roster_avatar_width')) + renderer.set_property('width', gajim.config.get( + 'roster_avatar_width')) else: renderer.set_property('visible', False) if parent_iter: @@ -105,7 +107,7 @@ else: renderer.set_property('foreground', None) renderer.set_property('font', - gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) + gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) else: # it is root (eg. group) bgcolor = gajim.config.get_per('themes', theme, 'groupbgcolor') if bgcolor: @@ -120,7 +122,7 @@ else: set_renderer_color(tv, renderer, False) renderer.set_property('font', - gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) + gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) class PrivateChatControl(ChatControl): @@ -132,7 +134,8 @@ def __init__(self, parent_win, gc_contact, contact, account, session): room_jid = gc_contact.room_jid - room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) + room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, + account) if room_jid in gajim.interface.minimized_controls[account]: room_ctrl = gajim.interface.minimized_controls[account][room_jid] if room_ctrl: @@ -161,14 +164,14 @@ gc_contact = gajim.contacts.get_gc_contact(self.account, room, nick) if not gc_contact: dialogs.ErrorDialog( - _('Sending private message failed'), - #in second %s code replaces with nickname - _('You are no longer in group chat "%(room)s" or "%(nick)s" has ' - 'left.') % {'room': room, 'nick': nick}) + _('Sending private message failed'), + #in second %s code replaces with nickname + _('You are no longer in group chat "%(room)s" or ' + '"%(nick)s" has left.') % {'room': room, 'nick': nick}) return ChatControl.send_message(self, message, xhtml=xhtml, - process_commands=process_commands) + process_commands=process_commands) def update_ui(self): if self.contact.show == 'offline': @@ -185,7 +188,8 @@ if not self.session: fjid = self.gc_contact.get_full_jid() - new_sess = gajim.connections[self.account].make_new_session(fjid, type_=self.type_id) + new_sess = gajim.connections[self.account].make_new_session(fjid, + type_=self.type_id) self.set_session(new_sess) self.session.negotiate_e2e(False) @@ -199,9 +203,9 @@ def __init__(self, parent_win, contact, acct, is_continued=False): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, - 'groupchat_control', contact, acct) + 'groupchat_control', contact, acct) - self.is_continued=is_continued + self.is_continued = is_continued self.is_anonymous = True # Controls the state of autorejoin. @@ -214,7 +218,7 @@ self.actions_button = self.xml.get_object('muc_window_actions_button') id_ = self.actions_button.connect('clicked', - self.on_actions_button_clicked) + self.on_actions_button_clicked) self.handlers[id_] = self.actions_button widget = self.xml.get_object('change_nick_button') @@ -222,7 +226,8 @@ self.handlers[id_] = widget widget = self.xml.get_object('change_subject_button') - id_ = widget.connect('clicked', self._on_change_subject_menuitem_activate) + id_ = widget.connect('clicked', + self._on_change_subject_menuitem_activate) self.handlers[id_] = widget widget = self.xml.get_object('bookmark_button') @@ -232,7 +237,7 @@ break else: id_ = widget.connect('clicked', - self._on_bookmark_room_menuitem_activate) + self._on_bookmark_room_menuitem_activate) self.handlers[id_] = widget widget.show() @@ -240,27 +245,28 @@ id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget - id_ = widget.connect('row_collapsed', self.on_list_treeview_row_collapsed) + id_ = widget.connect('row_collapsed', + self.on_list_treeview_row_collapsed) self.handlers[id_] = widget id_ = widget.connect('row_activated', - self.on_list_treeview_row_activated) + self.on_list_treeview_row_activated) self.handlers[id_] = widget id_ = widget.connect('button_press_event', - self.on_list_treeview_button_press_event) + self.on_list_treeview_button_press_event) self.handlers[id_] = widget id_ = widget.connect('key_press_event', - self.on_list_treeview_key_press_event) + self.on_list_treeview_key_press_event) self.handlers[id_] = widget id_ = widget.connect('motion_notify_event', - self.on_list_treeview_motion_notify_event) + self.on_list_treeview_motion_notify_event) self.handlers[id_] = widget id_ = widget.connect('leave_notify_event', - self.on_list_treeview_leave_notify_event) + self.on_list_treeview_leave_notify_event) self.handlers[id_] = widget self.room_jid = self.contact.jid @@ -277,9 +283,9 @@ compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_object('banner_eventbox'), - gajim.config.get('hide_groupchat_banner')) + gajim.config.get('hide_groupchat_banner')) self.widget_set_visible(self.xml.get_object('list_scrolledwindow'), - gajim.config.get('hide_groupchat_occupants_list')) + gajim.config.get('hide_groupchat_occupants_list')) self._last_selected_contact = None # None or holds jid, account tuple @@ -301,7 +307,7 @@ self.gc_count_nicknames_colors = 0 self.gc_custom_colors = {} self.number_of_colors = len(gajim.config.get('gc_nicknames_colors').\ - split(':')) + split(':')) self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') @@ -314,17 +320,17 @@ self.list_treeview = self.xml.get_object('list_treeview') selection = self.list_treeview.get_selection() id_ = selection.connect('changed', - self.on_list_treeview_selection_changed) + self.on_list_treeview_selection_changed) self.handlers[id_] = selection id_ = self.list_treeview.connect('style-set', - self.on_list_treeview_style_set) + self.on_list_treeview_style_set) self.handlers[id_] = self.list_treeview self.resize_from_another_muc = False # we want to know when the the widget resizes, because that is # an indication that the hpaned has moved... # FIXME: Find a better indicator that the hpaned has moved. id_ = self.list_treeview.connect('size-allocate', - self.on_treeview_size_allocate) + self.on_treeview_size_allocate) self.handlers[id_] = self.list_treeview #status_image, shown_nick, type, nickname, avatar store = gtk.TreeStore(gtk.Image, str, str, str, gtk.gdk.Pixbuf) @@ -343,24 +349,25 @@ column.pack_start(renderer_pixbuf, expand=False) column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR) column.set_cell_data_func(renderer_pixbuf, tree_cell_data_func, - self.list_treeview) + self.list_treeview) if gajim.config.get('avatar_position_in_roster') == 'left': add_avatar_renderer() - renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img + # status img + renderer_image = cell_renderer_image.CellRendererImage(0, 0) renderer_image.set_property('width', 26) column.pack_start(renderer_image, expand=False) column.add_attribute(renderer_image, 'image', C_IMG) column.set_cell_data_func(renderer_image, tree_cell_data_func, - self.list_treeview) + self.list_treeview) renderer_text = gtk.CellRendererText() # nickname column.pack_start(renderer_text, expand=True) column.add_attribute(renderer_text, 'markup', C_TEXT) renderer_text.set_property("ellipsize", pango.ELLIPSIZE_END) column.set_cell_data_func(renderer_text, tree_cell_data_func, - self.list_treeview) + self.list_treeview) if gajim.config.get('avatar_position_in_roster') == 'right': add_avatar_renderer() @@ -412,7 +419,7 @@ if type1 == 'contact' and type2 == 'contact' and \ gajim.config.get('sort_by_show_in_muc'): cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4, - 'invisible': 5, 'offline': 6, 'error': 7} + 'invisible': 5, 'offline': 6, 'error': 7} show1 = cshow[gc_contact1.show] show2 = cshow[gc_contact2.show] if show1 < show2: @@ -442,7 +449,8 @@ self.room_jid)): item = gtk.MenuItem(nick, use_underline=False) submenu.append(item) - id_ = item.connect('activate', self.append_nick_in_msg_textview, nick) + id_ = item.connect('activate', self.append_nick_in_msg_textview, + nick) self.handlers[id_] = item menu.show_all() @@ -533,8 +541,8 @@ self.attention_flag = False # get active color from gtk color = self.parent_win.notebook.style.fg[gtk.STATE_ACTIVE] - elif chatstate == 'newmsg' and (not has_focus or not current_tab) and\ - not self.attention_flag: + elif chatstate == 'newmsg' and (not has_focus or not current_tab) \ + and not self.attention_flag: color_name = gajim.config.get_per('themes', theme, 'state_muc_msg_color') if color_name: @@ -637,7 +645,8 @@ subject = helpers.reduce_chars_newlines(self.subject, max_lines=2) subject = gobject.markup_escape_text(subject) subject_text = self.urlfinder.sub(self.make_href, subject) - subject_text = '%s' % (font_attrs_small, subject_text) + subject_text = '%s' % (font_attrs_small, + subject_text) # tooltip must always hold ALL the subject self.event_box.set_tooltip_text(self.subject) @@ -690,13 +699,13 @@ ag = gtk.accel_groups_from_object(self.parent_win.window)[0] change_nick_menuitem.add_accelerator('activate', ag, gtk.keysyms.n, - gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, gtk.ACCEL_VISIBLE) + gtk.gdk.CONTROL_MASK | gtk.gdk.SHIFT_MASK, gtk.ACCEL_VISIBLE) change_subject_menuitem.add_accelerator('activate', ag, - gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE) + gtk.keysyms.t, gtk.gdk.MOD1_MASK, gtk.ACCEL_VISIBLE) bookmark_room_menuitem.add_accelerator('activate', ag, gtk.keysyms.b, - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) history_menuitem.add_accelerator('activate', ag, gtk.keysyms.h, - gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) + gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE) if self.contact.jid in gajim.config.get_per('accounts', self.account, 'minimized_gc').split(' '): @@ -705,7 +714,7 @@ bookmark_room_menuitem.set_sensitive(False) if gajim.gc_connected[self.account][self.room_jid]: c = gajim.contacts.get_gc_contact(self.account, self.room_jid, - self.nick) + self.nick) if c.affiliation not in ('owner', 'admin'): configure_room_menuitem.set_sensitive(False) else: @@ -725,55 +734,55 @@ # connect the menuitems to their respective functions id_ = bookmark_room_menuitem.connect('activate', - self._on_bookmark_room_menuitem_activate) + self._on_bookmark_room_menuitem_activate) self.handlers[id_] = bookmark_room_menuitem id_ = change_nick_menuitem.connect('activate', - self._on_change_nick_menuitem_activate) + self._on_change_nick_menuitem_activate)

1 0

gajim: [eMerzh and me] ability to restart a new adhoc command wi...
by Yann Leboulanger 12 May '10

12 May '10

changeset cfaa58dd8bfc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cfaa58dd8bfc description: [eMerzh and me] ability to restart a new adhoc command without closing / reopening the window. Fixes #5698 diffstat: data/gui/adhoc_commands_window.ui | 24 ++++++++++++++++++++---- src/adhoc_commands.py | 33 ++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 13 deletions(-) diffs (141 lines): diff -r 06e6d0654ac7 -r cfaa58dd8bfc data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Tue May 11 17:20:23 2010 +0200 +++ b/data/gui/adhoc_commands_window.ui Wed May 12 10:18:52 2010 +0200 @@ -359,6 +359,22 @@ <property name="spacing">12</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="restart_button"> + <property name="label">gtk-goto-first</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_restart_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="back_button"> <property name="label">gtk-go-back</property> <property name="visible">True</property> @@ -371,7 +387,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -387,7 +403,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -403,7 +419,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -419,7 +435,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> diff -r 06e6d0654ac7 -r cfaa58dd8bfc src/adhoc_commands.py --- a/src/adhoc_commands.py Tue May 11 17:20:23 2010 +0200 +++ b/src/adhoc_commands.py Wed May 12 10:18:52 2010 +0200 @@ -55,22 +55,15 @@ # an account object self.account = gajim.connections[account] self.jid = jid - - self.pulse_id = None # to satisfy self.setup_pulsing() - self.commandlist = None # a list of (commandname, commanddescription) - - # command's data self.commandnode = commandnode - self.sessionid = None - self.dataform = None - self.allow_stage3_close = False + self.data_form_widget = None # retrieving widgets from xml self.xml = gtkgui_helpers.get_gtk_builder('adhoc_commands_window.ui') self.window = self.xml.get_object('adhoc_commands_window') self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) - for name in ('back_button', 'forward_button', + for name in ('restart_button', 'back_button', 'forward_button', 'execute_button', 'close_button', 'stages_notebook', 'retrieving_commands_stage_vbox', 'command_list_stage_vbox', 'command_list_vbox', @@ -79,7 +72,22 @@ 'error_description_label'): self.__dict__[name] = self.xml.get_object(name) + self.initiate() + + def initiate(self): + + self.pulse_id = None # to satisfy self.setup_pulsing() + self.commandlist = None # a list of (commandname, commanddescription) + + # command's data + self.sessionid = None + self.dataform = None + self.allow_stage3_close = False + # creating data forms widget + if self.data_form_widget: + self.sending_form_stage_vbox.remove(self.data_form_widget) + self.data_form_widget.destroy() self.data_form_widget = dataforms_widget.DataFormWidget() self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget) @@ -95,6 +103,8 @@ self.xml.connect_signals(self) self.window.show_all() + self.restart_button.set_sensitive(False) + # These functions are set up by appropriate stageX methods. def stage_finish(self, *anything): pass @@ -377,6 +387,7 @@ if self.form_status == 'completed': self.close_button.set_sensitive(True) + self.restart_button.set_sensitive(True) self.back_button.hide() self.forward_button.hide() self.execute_button.hide() @@ -393,6 +404,10 @@ self.notes_label.set_no_show_all(True) self.notes_label.hide() + def on_restart_button_clicked(self, widget): + self.commandnode = None + self.initiate() + # stage 4: no commands are exposed def stage4(self): """

1 0

gajim: indicator API changes too much, remove it's support. Fixe...
by Yann Leboulanger 11 May '10

11 May '10

changeset 06e6d0654ac7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=06e6d0654ac7 description: indicator API changes too much, remove it's support. Fixes #5694 diffstat: src/common/gajim.py | 6 ------ src/gui_interface.py | 4 ---- src/notify.py | 30 ------------------------------ 3 files changed, 0 insertions(+), 40 deletions(-) diffs (77 lines): diff -r 93347da8f4f0 -r 06e6d0654ac7 src/common/gajim.py --- a/src/common/gajim.py Tue May 11 16:58:53 2010 +0200 +++ b/src/common/gajim.py Tue May 11 17:20:23 2010 +0200 @@ -181,12 +181,6 @@ # read. HAVE_LATEX = False -HAVE_INDICATOR = True -try: - import indicate -except ImportError: - HAVE_INDICATOR = False - HAVE_FARSIGHT = True try: import farsight, gst diff -r 93347da8f4f0 -r 06e6d0654ac7 src/gui_interface.py --- a/src/gui_interface.py Tue May 11 16:58:53 2010 +0200 +++ b/src/gui_interface.py Tue May 11 17:20:23 2010 +0200 @@ -3260,10 +3260,6 @@ if resolver.USE_LIBASYNCNS: gobject.timeout_add(200, gajim.resolver.process) - # setup the indicator - if gajim.HAVE_INDICATOR: - notify.setup_indicator_server() - def remote_init(): if gajim.config.get('remote_control'): try: diff -r 93347da8f4f0 -r 06e6d0654ac7 src/notify.py --- a/src/notify.py Tue May 11 16:58:53 2010 +0200 +++ b/src/notify.py Tue May 11 17:20:23 2010 +0200 @@ -50,24 +50,6 @@ except ImportError: USER_HAS_PYNOTIFY = False -if gajim.HAVE_INDICATOR: - import indicate - -def setup_indicator_server(): - server = indicate.indicate_server_ref_default() - server.set_type('message.im') - server.set_desktop_file('/usr/share/applications/gajim.desktop') - server.connect('server-display', server_display) - server.show() - -def display(indicator, account, jid, msg_type): - gajim.interface.handle_event(account, jid, msg_type) - indicator.hide() - -def server_display(server): - win = gajim.interface.roster.window - win.present() - def get_show_in_roster(event, account, contact, session=None): """ Return True if this event must be shown in roster, else False @@ -344,18 +326,6 @@ if not path_to_image: path_to_image = gtkgui_helpers.get_icon_path('gajim-chat_msg_recv', 48) - if gajim.HAVE_INDICATOR and event_type in (_('New Message'), - _('New Single Message'), _('New Private Message')): - indicator = indicate.Indicator() - indicator.set_property('subtype', 'im') - indicator.set_property('sender', jid) - indicator.set_property('body', text) - indicator.set_property_time('time', time.time()) - pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_image) - indicator.set_property_icon('icon', pixbuf) - indicator.connect('user-display', display, account, jid, msg_type) - indicator.show() - # Try to show our popup via D-Bus and notification daemon if gajim.config.get('use_notif_daemon') and dbus_support.supported: try:

1 0

gajim: check birthday date format when editing profile window. F...
by Yann Leboulanger 11 May '10

11 May '10

changeset 93347da8f4f0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93347da8f4f0 description: check birthday date format when editing profile window. Fixes #5692 diffstat: data/gui/profile_window.ui | 1 + src/profile_window.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diffs (35 lines): diff -r 8954be23e65e -r 93347da8f4f0 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Wed May 05 19:32:18 2010 +0200 +++ b/data/gui/profile_window.ui Tue May 11 16:58:53 2010 +0200 @@ -432,6 +432,7 @@ <object class="GtkEntry" id="BDAY_entry"> <property name="visible">True</property> <property name="can_focus">True</property> + <signal name="focus_out_event" handler="on_BDAY_entry_focus_out_event"/> </object> <packing> <property name="left_attach">3</property> diff -r 8954be23e65e -r 93347da8f4f0 src/profile_window.py --- a/src/profile_window.py Wed May 05 19:32:18 2010 +0200 +++ b/src/profile_window.py Tue May 11 16:58:53 2010 +0200 @@ -203,6 +203,20 @@ elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) + def on_BDAY_entry_focus_out_event(self, widget, event): + txt = widget.get_text() + if not txt: + return + try: + time.strptime(txt, '%Y-%m-%d') + except ValueError: + if not widget.is_focus(): + pritext = _('Wrong date format') + dialogs.ErrorDialog(pritext, _('Format of the date must be ' + 'YYYY-MM-DD')) + gobject.idle_add(lambda: widget.grab_focus()) + return True + def set_value(self, entry_name, value): try: self.xml.get_object(entry_name).set_text(value)

1 0

gajim: merge with default
by Kjell Braden 08 May '10

08 May '10

changeset c43a1b01d54d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c43a1b01d54d description: merge with default diffstat: README.html | 4 +- README.transifex | 11 + autogen.sh | 4 +- data/gui/account_context_menu.ui | 16 +- data/gui/accounts_window.ui | 66 +- data/gui/advanced_menuitem_menu.ui | 4 +- data/gui/blocked_contacts_window.ui | 2 +- data/gui/chat_context_menu.ui | 14 +- data/gui/chat_to_muc_window.ui | 3 - data/gui/filetransfers.ui | 6 +- data/gui/gc_control_popup_menu.ui | 14 +- data/gui/gc_occupants_menu.ui | 12 +- data/gui/history_manager.ui | 2 +- data/gui/input_dialog.ui | 1 + data/gui/popup_notification_window.ui | 4 +- data/gui/roster_window.ui | 24 +- data/gui/service_discovery_window.ui | 7 +- data/gui/subscription_request_popup_menu.ui | 2 +- data/gui/systray_context_menu.ui | 8 +- data/gui/xml_console_window.ui | 2 +- data/gui/zeroconf_context_menu.ui | 4 +- debian/changelog | 16 + debian/control | 2 +- debian/copyright | 6 +- po/LINGUAS | 2 + po/be.po | 5002 ++++---- po/be(a)latin.po | 5014 ++++---- po/bg.po | 5041 ++++---- po/br.po | 4946 ++++---- po/cs.po | 6955 ++++++----- po/da.po | 5027 ++++--- po/de.po | 7503 +++++++----- po/el.po | 4991 ++++---- po/en_GB.po | 5071 ++++---- po/eo.po | 5006 ++++---- po/es.po | 4950 ++++---- po/eu.po | 5016 ++++---- po/fr.po | 6997 +++++------ po/gl.po | 4920 ++++---- po/hr.po | 5037 ++++---- po/it.po | 5008 ++++---- po/ja.po | 10374 ++++++++++++++++++ po/kk.po | 9715 ++++++++++++++++ po/lt.po | 4906 ++++--- po/nb.po | 5050 ++++---- po/nl.po | 8431 +++++++------- po/no.po | 5050 ++++---- po/pl.po | 7328 +++++++----- po/pt.po | 4961 ++++---- po/pt_BR.po | 4627 ++++--- po/ru.po | 7086 ++++++------ po/sk.po | 6088 +++++----- po/sr.po | 5027 ++++--- po/sr(a)Latn.po | 5032 ++++--- po/sv.po | 5076 ++++---- po/tr.po | 9439 ++++++++++++++++ po/uk.po | 6986 +++++------ po/zh_CN.po | 4987 ++++---- scripts/dev/run-pylint.py | 1 - setup_win32.py | 6 +- src/adhoc_commands.py | 2 +- src/advanced_configuration_window.py | 4 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 108 +- src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 8 +- src/command_system/framework.py | 8 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 6 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 36 +- src/command_system/implementation/standard.py | 96 +- src/command_system/mapping.py | 2 +- src/common/GnuPG.py | 3 +- src/common/GnuPGInterface.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 2 +- src/common/commands.py | 41 +- src/common/config.py | 3 +- src/common/configpaths.py | 2 +- src/common/connection.py | 148 +- src/common/connection_handlers.py | 106 +- src/common/contacts.py | 9 +- src/common/dataforms.py | 3 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 4 +- src/common/dh.py | 43 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 2 +- src/common/helpers.py | 17 +- src/common/i18n.py | 36 +- src/common/jingle.py | 54 +- src/common/jingle_content.py | 5 + src/common/jingle_rtp.py | 80 +- src/common/jingle_session.py | 80 +- src/common/latex.py | 2 +- src/common/location_listener.py | 71 +- src/common/logger.py | 2 +- src/common/multimedia_helpers.py | 7 +- src/common/optparser.py | 6 +- src/common/passwords.py | 2 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 7 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 4 +- src/common/xmpp/auth_nb.py | 41 +- src/common/xmpp/c14n.py | 1 - src/common/xmpp/client_nb.py | 3 + src/common/xmpp/idlequeue.py | 1 - src/common/xmpp/stringprepare.py | 2 +- src/common/xmpp/tls_nb.py | 42 +- src/common/xmpp/transports_nb.py | 3 +- src/common/zeroconf/client_zeroconf.py | 15 +- src/common/zeroconf/connection_handlers_zeroconf.py | 3 +- src/common/zeroconf/connection_zeroconf.py | 11 +- src/common/zeroconf/zeroconf_bonjour.py | 7 +- src/config.py | 241 +- src/conversation_textview.py | 2 +- src/dataforms_widget.py | 4 +- src/dialogs.py | 150 +- src/disco.py | 7 +- src/features_window.py | 5 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 4 +- src/gajim.py | 46 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 74 +- src/groups.py | 4 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 5 +- src/gui_interface.py | 69 +- src/gui_menu_builder.py | 15 +- src/history_manager.py | 2 +- src/history_window.py | 9 +- src/htmltextview.py | 2 +- src/ipython_view.py | 3 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 2 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 185 +- src/profile_window.py | 2 +- src/remote_control.py | 2 +- src/roster_window.py | 6 +- src/search_window.py | 2 +- src/session.py | 4 +- src/statusicon.py | 5 +- src/tooltips.py | 112 +- src/vcard.py | 4 +- test/lib/mock.py | 3 - 161 files changed, 119684 insertions(+), 79367 deletions(-) diffs (truncated from 356058 to 300 lines): diff -r fc3322e08c90 -r c43a1b01d54d README.html --- a/README.html Sun Feb 28 16:02:46 2010 +0100 +++ b/README.html Sat May 08 15:08:02 2010 +0200 @@ -23,7 +23,7 @@ <h2>Optional Runtime Requirements</h2> <ul> -<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for secure SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for secure SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> <li>python-crypto to enable End to end encryption</li> <li>For idle module, libxss library</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> @@ -119,7 +119,7 @@ -(C) 2003-200888888888 +(C) 2003-2010 The Gajim Team http://gajim.org diff -r fc3322e08c90 -r c43a1b01d54d README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Sat May 08 15:08:02 2010 +0200 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +ssh://hg.gajim.org/gajim + +Tokens: + +JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix diff -r fc3322e08c90 -r c43a1b01d54d autogen.sh --- a/autogen.sh Sun Feb 28 16:02:46 2010 +0100 +++ b/autogen.sh Sat May 08 15:08:02 2010 +0200 @@ -8,7 +8,9 @@ fi echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ + && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ + po/POTFILES.in; done \ + && ls -1 data/gajim.desktop.in.in \ src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff -r fc3322e08c90 -r c43a1b01d54d data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Sun Feb 28 16:02:46 2010 +0100 +++ b/data/gui/account_context_menu.ui Sat May 08 15:08:02 2010 +0200 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="account_context_menu"> <child> <object class="GtkImageMenuItem" id="status_menuitem"> - <property name="label">_Status</property> + <property name="label" translatable="yes">_Status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pep_menuitem"> - <property name="label">_Personal Events</property> + <property name="label" translatable="yes">_Personal Events</property> <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="use_underline">True</property> @@ -30,7 +30,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat...</property> + <property name="label" translatable="yes">_Start Chat...</property> <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="use_underline">True</property> @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_contact_menuitem"> - <property name="label">_Add Contact...</property> + <property name="label" translatable="yes">_Add Contact...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -63,7 +63,7 @@ </child> <child> <object class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="label">_Discover Services</property> + <property name="label" translatable="yes">_Discover Services</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -72,7 +72,7 @@ </child> <child> <object class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="label">_Execute Command...</property> + <property name="label" translatable="yes">_Execute Command...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image7</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r fc3322e08c90 -r c43a1b01d54d data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sun Feb 28 16:02:46 2010 +0100 +++ b/data/gui/accounts_window.ui Sat May 08 15:08:02 2010 +0200 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -203,7 +203,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -445,6 +445,68 @@ <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Client Cert File:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cert_entry1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="cert_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_for_client_cert_button"> + <property name="label" translatable="yes">Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Client certificate</property> + </object> + </child> + </object> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </object> </child> <child type="tab"> diff -r fc3322e08c90 -r c43a1b01d54d data/gui/advanced_menuitem_menu.ui --- a/data/gui/advanced_menuitem_menu.ui Sun Feb 28 16:02:46 2010 +0100 +++ b/data/gui/advanced_menuitem_menu.ui Sat May 08 15:08:02 2010 +0200 @@ -26,7 +26,7 @@ <object class="GtkMenu" id="administrator_menuitem_menu"> <child> <object class="GtkImageMenuItem" id="send_server_message_menuitem"> - <property name="label">_Send Server Message...</property> + <property name="label" translatable="yes">_Send Server Message...</property> <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="delete_motd_menuitem"> - <property name="label">Delete MOTD</property> + <property name="label" translatable="yes">Delete MOTD</property> <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> <property name="image">image2</property> <property name="use_stock">False</property> diff -r fc3322e08c90 -r c43a1b01d54d data/gui/blocked_contacts_window.ui --- a/data/gui/blocked_contacts_window.ui Sun Feb 28 16:02:46 2010 +0100 +++ b/data/gui/blocked_contacts_window.ui Sat May 08 15:08:02 2010 +0200 @@ -65,7 +65,7 @@ <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label">_Unblock</property> + <property name="label" translatable="yes">_Unblock</property> <property name="use_underline">True</property> </object> <packing> diff -r fc3322e08c90 -r c43a1b01d54d data/gui/chat_context_menu.ui --- a/data/gui/chat_context_menu.ui Sun Feb 28 16:02:46 2010 +0100 +++ b/data/gui/chat_context_menu.ui Sat May 08 15:08:02 2010 +0200 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="chat_context_menu"> <child> <object class="GtkImageMenuItem" id="copy_link_location_menuitem"> - <property name="label">_Copy Link Location</property> + <property name="label" translatable="yes">_Copy Link Location</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_link_in_browser_menuitem"> - <property name="label">_Open Link in Browser</property> + <property name="label" translatable="yes">_Open Link in Browser</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image2</property> @@ -23,7 +23,7 @@ </child> <child> <object class="GtkImageMenuItem" id="copy_email_address_menuitem"> - <property name="label">_Copy JID/Email Address</property> + <property name="label" translatable="yes">_Copy JID/Email Address</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image3</property> @@ -32,7 +32,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_email_composer_menuitem"> - <property name="label">_Open Email Composer</property> + <property name="label" translatable="yes">_Open Email Composer</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -46,7 +46,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -55,7 +55,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem">

1 0

gajim-website: add Mati's PPA link to download page
by Yann Leboulanger 08 May '10

08 May '10

changeset d7d4e30a813d in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=d7d4e30a813d description: add Mati's PPA link to download page diffstat: downloads.php | 2 + locale/bg_BG/LC_MESSAGES/msg.po | 111 +++++---- locale/de_DE/LC_MESSAGES/msg.po | 111 +++++---- locale/eo/LC_MESSAGES/msg.po | 111 +++++---- locale/es_ES/LC_MESSAGES/msg.po | 111 +++++---- locale/fr_FR/LC_MESSAGES/msg.po | 110 +++++---- locale/it_IT/LC_MESSAGES/msg.po | 111 +++++---- locale/pl_PL/LC_MESSAGES/msg.po | 111 +++++---- locale/pt_BR/LC_MESSAGES/msg.po | 111 +++++---- locale/ru_RU/LC_MESSAGES/msg.po | 444 +++++++++++++++++++++++++++------------ msg.pot | 110 +++++---- 11 files changed, 850 insertions(+), 593 deletions(-) diffs (truncated from 3636 to 300 lines): diff -r 70eca52bd0f9 -r d7d4e30a813d downloads.php --- a/downloads.php Fri Apr 23 04:38:33 2010 +0000 +++ b/downloads.php Sat May 08 14:14:59 2010 +0200 @@ -43,6 +43,8 @@ print ("</a>\n"); print _(" If you use Ubuntu universe repository do")." apt-get install gajim\n"; print (" \n"); +print _(" If you want newer version of Gajim, you can also use")." <a href=\"https://launchpad.net/~gajim/+archive/gajim-ppa\">"._("this PPA")."</a>\n"; +print (" \n"); print ("<a name=\"fedora\">\n"); print (" <h2>\n"); diff -r 70eca52bd0f9 -r d7d4e30a813d locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Fri Apr 23 04:38:33 2010 +0000 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sat May 08 14:14:59 2010 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-16 16:54+0200\n" +"POT-Creation-Date: 2010-05-08 14:13+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -173,8 +173,8 @@ msgid " List archives are available " msgstr " Архивите на списъка са достъпни " -#: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:156 -#: downloads.php:168 downloads.php:206 downloads.php:226 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:36 downloads.php:158 +#: downloads.php:170 downloads.php:208 downloads.php:228 msgid "here" msgstr "тук" @@ -281,7 +281,7 @@ msgid " To get one of these versions, go to the %s page.\n" msgstr " За да изтеглите някоя от тези версии, отидете на страницата" -#: docs.php:22 downloads.php:171 +#: docs.php:22 downloads.php:173 msgid " Under GNU/Linux\n" msgstr " Под GNU/Линукс\n" @@ -389,104 +389,113 @@ msgid " If you use Ubuntu universe repository do" msgstr " Ако използвате хранилището „universe“ на Убунту, изпълнете" -#: downloads.php:52 downloads.php:59 downloads.php:66 downloads.php:89 -#: downloads.php:97 downloads.php:105 downloads.php:113 +#: downloads.php:46 +#, fuzzy +msgid " If you want newer version of Gajim, you can also use" +msgstr " Последната версия на Gajim е" + +#: downloads.php:46 +msgid "this PPA" +msgstr "" + +#: downloads.php:54 downloads.php:61 downloads.php:68 downloads.php:91 +#: downloads.php:99 downloads.php:107 downloads.php:115 msgid " Just" msgstr " Само" -#: downloads.php:56 +#: downloads.php:58 msgid " Gentoo\n" msgstr " Дженту\n" -#: downloads.php:63 +#: downloads.php:65 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:70 +#: downloads.php:72 msgid " SUSE\n" msgstr " SuSE\n" -#: downloads.php:73 +#: downloads.php:75 msgid " openSuSE 11: " msgstr "" -#: downloads.php:73 +#: downloads.php:75 msgid "one click install" msgstr "" -#: downloads.php:75 +#: downloads.php:77 msgid " openSuSE 10.x: " msgstr "" -#: downloads.php:75 +#: downloads.php:77 msgid "get it here" msgstr "" -#: downloads.php:79 +#: downloads.php:81 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:82 +#: downloads.php:84 #, fuzzy msgid " Just " msgstr " Само" -#: downloads.php:86 +#: downloads.php:88 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:118 +#: downloads.php:120 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:121 +#: downloads.php:123 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" " Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " -#: downloads.php:123 +#: downloads.php:125 msgid "Find out more" msgstr "Научете повече" -#: downloads.php:127 +#: downloads.php:129 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:130 +#: downloads.php:132 msgid "Soon available here." msgstr "Скоро достъпен тук." -#: downloads.php:140 +#: downloads.php:142 msgid " Windows installer\n" msgstr " Инсталатор за „Уиндоус“\n" -#: downloads.php:143 +#: downloads.php:145 #, fuzzy msgid " There is a " msgstr " Ето някои" -#: downloads.php:143 +#: downloads.php:145 #, fuzzy msgid "Gajim installer" msgstr "Инсталатор за „Уиндоус“" -#: downloads.php:153 +#: downloads.php:155 msgid " Source\n" msgstr " Изходен код\n" -#: downloads.php:156 +#: downloads.php:158 msgid " The tarball version of Gajim is " msgstr " Архивиран изходен код на версията на Gajim има " -#: downloads.php:156 +#: downloads.php:158 msgid "For information on how to build Gajim," msgstr "За информация как да компилирате Gajim," -#: downloads.php:156 +#: downloads.php:158 msgid "in English" msgstr "на английски език" -#: downloads.php:159 +#: downloads.php:161 #, fuzzy msgid "" "If you want to use the last unstable development version, then you should " @@ -495,27 +504,27 @@ "Ако искате да ползвате последната нестабилна версия, все още в процес на " "разработка, то изтеглете работно копие на хранилището на subversion.\n" -#: downloads.php:165 +#: downloads.php:167 #, fuzzy msgid " Mercurial\n" msgstr " Структура\n" -#: downloads.php:168 +#: downloads.php:170 #, fuzzy msgid " The mercurial repository is available at this address: " msgstr " Сървърът на subversion е достъпен на този адрес: " -#: downloads.php:168 +#: downloads.php:170 msgid "and viewable" msgstr "и може да се разглежда" -#: downloads.php:173 +#: downloads.php:175 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " За да изтеглите изходния код на Gajim, трябва да изпълните следните " "стъпки:\n" -#: downloads.php:174 +#: downloads.php:176 #, fuzzy msgid "" " You first have to install mercurial (apt-get install mercurial " @@ -524,31 +533,31 @@ " Да инсталирате subversion (apt-get install subversion под " "Дебиан)\n" -#: downloads.php:176 +#: downloads.php:178 msgid " Then in a console, enter the following commands:\n" msgstr " След това, в конзола въведете следните команди:\n" -#: downloads.php:184 +#: downloads.php:186 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Инсталирайте зависимостите и компилирайте Gajim. Вижте" -#: downloads.php:184 +#: downloads.php:186 msgid "English" msgstr "на английски език" -#: downloads.php:184 +#: downloads.php:186 msgid "for details.\n" msgstr "за подробности.\n" -#: downloads.php:187 +#: downloads.php:189 msgid " You can run Gajim by typing the following:\n" msgstr " Може да стартирате Gajim, като напишете:\n" -#: downloads.php:191 +#: downloads.php:193 msgid "and then" msgstr "и после" -#: downloads.php:195 +#: downloads.php:197 #, fuzzy msgid "" " Once you have the repository, you can update it periodicaly so it matches " @@ -557,11 +566,11 @@ " След като имате хранилището, може да го обновявате периодично спрямо " "последната версия от сървъра на Subversion чрез тази команда:\n" -#: downloads.php:204 +#: downloads.php:206 msgid " Under Windows\n" msgstr " Под „Уиндоус“\n" -#: downloads.php:206 +#: downloads.php:208 #, fuzzy msgid "" " You first have to install mercurial for windows. In order to do that, " @@ -570,7 +579,7 @@ " Първо трябва да инсталирате subversion за „Уиндоус“. За тази цел " "изтеглете двоичния файл" -#: downloads.php:208 +#: downloads.php:210 #, fuzzy msgid "" " Once mercurial is installed, the commands are the same with those under " @@ -581,21 +590,21 @@ "GNU/Линукс. Единствената разлика е, че вместо launch.sh стартирате launch." "bat. Въведете ги в командния ред на допотопния „MS-DOS Prompt“ и сте готови." -#: downloads.php:210 +#: downloads.php:212 msgid "" " To run Gajim, you need external libraries. You can find a tutorial on the " "way to install them" msgstr "" -#: downloads.php:210 +#: downloads.php:212 msgid "On the Wiki" msgstr "" -#: downloads.php:215 +#: downloads.php:217 msgid " Daily Snapshots\n" msgstr " Ежедневни архиви от хранилището\n" -#: downloads.php:218

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2010