Commits February 2008

commits@gajim.org

5 participants
62 discussions

[commit-gajim] r9337 - trunk/src
by asterix＠gajim.org 25 Feb '08

25 Feb '08

Author: asterix Date: 2008-02-25 21:41:41 +0100 (Mon, 25 Feb 2008) New Revision: 9337 Modified: trunk/src/gajim.py Log: no need to draw muc in roster each time we get a presence or each time we get a message. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-25 14:42:53 UTC (rev 9336) +++ trunk/src/gajim.py 2008-02-25 20:41:41 UTC (rev 9337) @@ -1176,11 +1176,6 @@ control.chg_contact_status(nick, show, status, array[4], array[5], array[6], array[7], array[8], array[9], array[10], array[11]) - contact = gajim.contacts.\ - get_contact_with_highest_priority(account, room_jid) - if contact: - self.roster.draw_contact(room_jid, account) - ctrl = self.msg_win_mgr.get_control(fjid, account) # print status in chat window and update status/GPG image @@ -1240,11 +1235,6 @@ gc_control.on_message(nick, array[1], array[2], array[3], xhtml, array[5]) - contact = gajim.contacts.\ - get_contact_with_highest_priority(account, room_jid) - if contact: - self.roster.draw_contact(room_jid, account) - if self.remote_ctrl: self.remote_ctrl.raise_signal('GCMessage', (account, array))

1 0

[commit-gajim] r9336 - trunk/src
by asterix＠gajim.org 25 Feb '08

25 Feb '08

Author: asterix Date: 2008-02-25 15:42:53 +0100 (Mon, 25 Feb 2008) New Revision: 9336 Modified: trunk/src/chat_control.py Log: don't grab focus on message textview when we select a tab. fixes #3740 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-25 14:09:47 UTC (rev 9335) +++ trunk/src/chat_control.py 2008-02-25 14:42:53 UTC (rev 9336) @@ -797,7 +797,6 @@ types = type_): # There were events to remove self.redraw_after_event_removed(jid) - self.msg_textview.grab_focus() # Note, we send None chatstate to preserve current self.parent_win.redraw_tab(self)

1 0

[commit-gajim] r9335 - in trunk/src: . common
by asterix＠gajim.org 25 Feb '08

25 Feb '08

Author: asterix Date: 2008-02-25 15:09:47 +0100 (Mon, 25 Feb 2008) New Revision: 9335 Modified: trunk/src/common/config.py trunk/src/gajim.py Log: [shtrom] $S and $T in autoaway status message. fixes $3741 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-02-17 20:57:47 UTC (rev 9334) +++ trunk/src/common/config.py 2008-02-25 14:09:47 UTC (rev 9335) @@ -77,10 +77,10 @@ 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], 'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ], - 'autoaway_message': [ opt_str, _('Away as a result of being idle') ], + 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoaway time.') ], 'autoxa': [ opt_bool, True ], 'autoxatime': [ opt_int, 15, _('Time in minutes, after which your status changes to not available.') ], - 'autoxa_message': [ opt_str, _('Not available as a result of being idle') ], + 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S with be replaced by current status message, $T by autoxa time.') ], 'ask_online_status': [ opt_bool, False ], 'ask_offline_status': [ opt_bool, False ], 'last_status_msg_online': [ opt_str, '' ], Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-17 20:57:47 UTC (rev 9334) +++ trunk/src/gajim.py 2008-02-25 14:09:47 UTC (rev 9335) @@ -2324,6 +2324,13 @@ auto_message = gajim.config.get('autoaway_message') if not auto_message: auto_message = gajim.connections[account].status + else: + auto_message = auto_message.replace('$S','%(status)s') + auto_message = auto_message.replace('$T','%(time)s') + auto_message = auto_message % { + 'status': gajim.status_before_autoaway[account], + 'time': gajim.config.get('autoawaytime') + } self.roster.send_status(account, 'away', auto_message, auto=True) gajim.sleeper_state[account] = 'autoaway' elif state == common.sleepy.STATE_XA and (\ @@ -2334,6 +2341,13 @@ auto_message = gajim.config.get('autoxa_message') if not auto_message: auto_message = gajim.connections[account].status + else: + auto_message = auto_message.replace('$S','%(status)s') + auto_message = auto_message.replace('$T','%(time)s') + auto_message = auto_message % { + 'status': gajim.status_before_autoaway[account], + 'time': gajim.config.get('autoxatime') + } self.roster.send_status(account, 'xa', auto_message, auto=True) gajim.sleeper_state[account] = 'autoxa' return True # renew timeout (loop for ever)

1 0

[commit-gajim] r9334 - trunk/src
by asterix＠gajim.org 17 Feb '08

17 Feb '08

Author: asterix Date: 2008-02-17 21:57:47 +0100 (Sun, 17 Feb 2008) New Revision: 9334 Modified: trunk/src/message_window.py Log: [shtrom] Disable CTRL+W when GTK has Emacs-like key mappings. Fixes #3738 Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-02-17 20:44:38 UTC (rev 9333) +++ trunk/src/message_window.py 2008-02-17 20:57:47 UTC (rev 9334) @@ -300,7 +300,11 @@ elif keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(control, self.CLOSE_CTRL_KEY) elif keyval == gtk.keysyms.w: # CTRL + W - self.remove_tab(control, self.CLOSE_CTRL_KEY) + # CTRL + W removes latest word before sursor when User uses emacs + # theme + if not gtk.settings_get_default().get_property( + 'gtk-key-theme-name') == 'Emacs': + self.remove_tab(control, self.CLOSE_CTRL_KEY) # MOD1 (ALT) mask elif modifier & gtk.gdk.MOD1_MASK:

1 0

[commit-gajim] r9333 - trunk/src
by asterix＠gajim.org 17 Feb '08

17 Feb '08

Author: asterix Date: 2008-02-17 21:44:38 +0100 (Sun, 17 Feb 2008) New Revision: 9333 Modified: trunk/src/notify.py Log: no need to escape strings that go to notification daemon Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-02-17 16:01:44 UTC (rev 9332) +++ trunk/src/notify.py 2008-02-17 20:44:38 UTC (rev 9333) @@ -315,9 +315,6 @@ '''Notifies a user of an event. It first tries to a valid implementation of the Desktop Notification Specification. If that fails, then we fall back to the older style PopupNotificationWindow method.''' - text = gobject.markup_escape_text(text) - title = gobject.markup_escape_text(title) - if gajim.config.get('use_notif_daemon') and dbus_support.supported: try: DesktopNotification(event_type, jid, account, msg_type,

1 0

[commit-gajim] r9332 - trunk/src/common
by asterix＠gajim.org 17 Feb '08

17 Feb '08

Author: asterix Date: 2008-02-17 17:01:44 +0100 (Sun, 17 Feb 2008) New Revision: 9332 Modified: trunk/src/common/helpers.py Log: [Merwok] use os.pathsep to know the PATH environment separator Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-02-15 22:55:21 UTC (rev 9331) +++ trunk/src/common/helpers.py 2008-02-17 16:01:44 UTC (rev 9332) @@ -382,7 +382,7 @@ # on failures False is returned is_in_dir = False found_in_which_dir = None - path = os.getenv('PATH').split(':') + path = os.getenv('PATH').split(os.pathsep) for path_to_directory in path: try: contents = os.listdir(path_to_directory)

1 0

[commit-gajim] r9331 - in trunk: data/glade src src/common
by asterix＠gajim.org 15 Feb '08

15 Feb '08

Author: asterix Date: 2008-02-15 23:55:21 +0100 (Fri, 15 Feb 2008) New Revision: 9331 Modified: trunk/data/glade/manage_pep_services_window.glade trunk/src/common/connection_handlers.py trunk/src/common/pubsub.py trunk/src/config.py trunk/src/dataforms_widget.py trunk/src/dialogs.py trunk/src/gajim.py Log: ability to configure pubsub nodes. see #3053 Modified: trunk/data/glade/manage_pep_services_window.glade =================================================================== --- trunk/data/glade/manage_pep_services_window.glade 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/data/glade/manage_pep_services_window.glade 2008-02-15 22:55:21 UTC (rev 9331) @@ -1,135 +1,120 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkWindow" id="manage_pep_services_window"> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="title" translatable="yes"></property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="default_width">350</property> - <property name="default_height">150</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="destroy" handler="on_manage_pep_services_window_destroy"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="services_treeview"> - <property name="visible">True</property> - <property name="can_focus">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="headers_visible">True</property> - <property name="rules_hint">False</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/> - </widget> - </child> - <child> - <widget class="GtkButton" id="delete_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_delete_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/> - </widget> - </child> - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:58:52 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="ok_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-ok</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_ok_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <widget class="GtkWindow" id="manage_pep_services_window"> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="default_width">350</property> + <property name="default_height">150</property> + <signal name="destroy" handler="on_manage_pep_services_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <widget class="GtkTreeView" id="services_treeview"> + <property name="visible">True</property> + <property name="can_focus">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> + </widget> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> + <property name="response_id">-5</property> + <signal name="clicked" handler="on_add_button_clicked"/> + </widget> + </child> + <child> + <widget class="GtkButton" id="delete_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">gtk-delete</property> + <property name="use_stock">True</property> + <property name="response_id">-5</property> + <signal name="clicked" handler="on_delete_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="configure_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">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="response_id">0</property> + <signal name="clicked" handler="on_configure_button_clicked"/> + <child> + <widget class="GtkHBox" id="hbox1"> + <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="GtkImage" id="image1"> + <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-preferences</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <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">_Configure</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="response_id">-6</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="padding">6</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/common/connection_handlers.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -59,7 +59,7 @@ AGENT_REMOVED = 'agent_removed' METACONTACTS_ARRIVED = 'metacontacts_arrived' PRIVACY_ARRIVED = 'privacy_arrived' -PEP_ACCESS_MODEL = 'pep_access_model' +PEP_CONFIG = 'pep_config' HAS_IDLE = True try: import idle @@ -1121,16 +1121,13 @@ self.get_privacy_list('block') # Ask metacontacts before roster self.get_metacontacts() - elif self.awaiting_answers[id][0] == PEP_ACCESS_MODEL: + elif self.awaiting_answers[id][0] == PEP_CONFIG: conf = iq_obj.getTag('pubsub').getTag('configure') node = conf.getAttr('node') form_tag = conf.getTag('x', namespace=common.xmpp.NS_DATA) if form_tag: form = common.dataforms.ExtendForm(node=form_tag) - for field in form.iter_fields(): - if field.var == 'pubsub#access_model': - self.dispatch('PEP_ACCESS_MODEL', (node, field.value)) - break + self.dispatch('PEP_CONFIG', (node, form)) del self.awaiting_answers[id] Modified: trunk/src/common/pubsub.py =================================================================== --- trunk/src/common/pubsub.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/common/pubsub.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -64,29 +64,14 @@ self.connection.send(query) - def send_pb_configure(self, jid, node, cb, *cbargs, **cbkwargs): + def send_pb_configure(self, jid, node, form): query = xmpp.Iq('set', to=jid) - c = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) + c = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER) c = c.addChild('configure', {'node': node}) + c.addChild(node=form) - id = self.connection.send(query) + self.connection.send(query) - def on_configure(self, connection, query): - try: - filledform = cb(stanza['pubsub']['configure']['x'], *cbargs, **cbkwargs) - #TODO: Build a form - #TODO: Send it - - except CancelConfigure: - cancel = xmpp.Iq('set', to=jid) - ca = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) - ca = ca.addChild('configure', {'node': node}) - #ca = ca.addChild('x', namespace=xmpp.NS_DATA, {'type': 'cancel'}) - - self.connection.send(cancel) - - self.__callbacks[id] = (on_configure, (), {}) - def _PubSubCB(self, conn, stanza): try: cb, args, kwargs = self.__callbacks.pop(stanza.getID()) @@ -100,5 +85,5 @@ e = e.addChild('configure', {'node': node}) id = self.connection.getAnID() query.setID(id) - self.awaiting_answers[id] = (connection_handlers.PEP_ACCESS_MODEL,) + self.awaiting_answers[id] = (connection_handlers.PEP_CONFIG,) self.connection.send(query) Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/config.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -3681,45 +3681,22 @@ '''close window''' del gajim.interface.instances[self.account]['pep_services'] - def on_ok_button_clicked(self, widget): - pass - - def on_cancel_button_clicked(self, widget): + def on_close_button_clicked(self, widget): self.window.destroy() - def cellrenderer_combo_edited(self, cellrenderer, path, new_text): - self.treestore[path][1] = new_text - def init_services(self): - treeview = self.xml.get_widget('services_treeview') + self.treeview = self.xml.get_widget('services_treeview') # service, access_model, group - self.treestore = gtk.ListStore(str, str, str) - treeview.set_model(self.treestore) + self.treestore = gtk.ListStore(str) + self.treeview.set_model(self.treestore) col = gtk.TreeViewColumn('Service') - treeview.append_column(col) + self.treeview.append_column(col) cellrenderer_text = gtk.CellRendererText() col.pack_start(cellrenderer_text) col.add_attribute(cellrenderer_text, 'text', 0) - col = gtk.TreeViewColumn('access model') - treeview.append_column(col) - - model = gtk.ListStore(str) - model.append(['open']) - model.append(['presence']) - model.append(['roster']) - model.append(['whitelist']) - cellrenderer_combo = gtk.CellRendererCombo() - cellrenderer_combo.set_property('text-column', 0) - cellrenderer_combo.set_property('model', model) - cellrenderer_combo.set_property('has-entry', False) - cellrenderer_combo.set_property('editable', True) - cellrenderer_combo.connect('edited', self.cellrenderer_combo_edited) - col.pack_start(cellrenderer_combo) - col.add_attribute(cellrenderer_combo, 'text', 1) - our_jid = gajim.get_jid_from_account(self.account) gajim.connections[self.account].discoverItems(our_jid) @@ -3727,9 +3704,21 @@ our_jid = gajim.get_jid_from_account(self.account) for item in items: if 'jid' in item and item['jid'] == our_jid and 'node' in item: - # ask <configure> to have access model - gajim.connections[self.account].request_pb_configuration( - item['jid'], item['node']) + self.treestore.append([item['node']]) - def new_service(self, node, model): - self.treestore.append([node, model, '']) + def on_configure_button_clicked(self, widget): + selection = self.treeview.get_selection() + if not selection: + return + model, iter = selection.get_selected() + node = model[iter][0] + our_jid = gajim.get_jid_from_account(self.account) + gajim.connections[self.account].request_pb_configuration(our_jid, node) + + def config(self, node, form): + def on_ok(form, node): + form.type = 'submit' + our_jid = gajim.get_jid_from_account(self.account) + gajim.connections[self.account].send_pb_configure(our_jid, node, form) + window = dialogs.DataFormWindow(form, (on_ok, node)) + window.show_all() Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/dataforms_widget.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -340,6 +340,8 @@ widget = gtk.VBox() first_radio = None for value, label in field.iter_options(): + if not label: + label = value radio = gtk.RadioButton(first_radio, label=label) radio.connect('toggled', self.on_list_single_radiobutton_toggled, field, value) Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/dialogs.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -1013,21 +1013,49 @@ return str_[0:-1] # remove latest . class Dialog(gtk.Dialog): - def __init__(self, parent, title, buttons, default = None): - gtk.Dialog.__init__(self, title, parent, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL | gtk.DIALOG_NO_SEPARATOR) + 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) + self.user_response_ok = on_response_ok + self.user_response_cancel = on_response_cancel self.set_border_width(6) self.vbox.set_spacing(12) self.set_resizable(False) + possible_responses = {gtk.STOCK_OK: self.on_response_ok, + gtk.STOCK_CANCEL: self.on_response_cancel} for stock, response in buttons: - self.add_button(stock, response) + b = self.add_button(stock, response) + for response in possible_responses: + if stock == response: + b.connect('clicked', possible_responses[response]) + break if default is not None: self.set_default_response(default) else: self.set_default_response(buttons[-1][1]) + def on_response_ok(self, widget): + if self.user_response_ok: + if isinstance(self.user_response_ok, tuple): + self.user_response_ok[0](*self.user_response_ok[1:]) + else: + self.user_response_ok() + self.destroy() + + def on_response_cancel(self, widget): + if self.user_response_cancel: + if isinstance(self.user_response_cancel, tuple): + self.user_response_cancel[0](*self.user_response_ok[1:]) + else: + self.user_response_cancel() + self.destroy() + + def just_destroy(self, widget): + self.destroy() + def get_button(self, index): buttons = self.action_area.get_children() return index < len(buttons) and buttons[index] or None @@ -3700,3 +3728,25 @@ def unique_room_id_error(self, server): self.unique_room_id_supported(server, gajim.nicks[self.account] + str(randrange(9999999))) + +class DataFormWindow(Dialog): + def __init__(self, form, on_response_ok): + self.df_response_ok = on_response_ok + Dialog.__init__(self, None, 'test', [(gtk.STOCK_CANCEL, + gtk.RESPONSE_REJECT), (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)], + on_response_ok=self.on_ok) + self.set_resizable(True) + self.dataform_widget = dataforms_widget.DataFormWidget() + self.dataform = dataforms.ExtendForm(node = form) + self.dataform_widget.set_sensitive(True) + self.dataform_widget.data_form = self.dataform + self.dataform_widget.show_all() + self.vbox.pack_start(self.dataform_widget) + + def on_ok(self): + form = self.dataform_widget.data_form + if isinstance(self.df_response_ok, tuple): + self.df_response_ok[0](form, *self.df_response_ok[1:]) + else: + self.df_response_ok(form) + self.destroy() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-15 10:38:52 UTC (rev 9330) +++ trunk/src/gajim.py 2008-02-15 22:55:21 UTC (rev 9331) @@ -2199,10 +2199,10 @@ _('You are already connected to this account with the same resource. Please type a new one'), input_str = gajim.connections[account].server_resource, is_modal = False, ok_handler = on_ok) - def handle_event_pep_access_model(self, account, data): - # ('PEP_ACCESS_MODEL', account, (node, model)) + def handle_event_pep_config(self, account, data): + # ('PEP_ACCESS_MODEL', account, (node, form)) if self.instances[account].has_key('pep_services'): - self.instances[account]['pep_services'].new_service(data[0], data[1]) + self.instances[account]['pep_services'].config(data[0], data[1]) def handle_event_unique_room_id_supported(self, account, data): '''Receive confirmation that unique_room_id are supported''' @@ -2629,7 +2629,7 @@ 'SEARCH_FORM': self.handle_event_search_form, 'SEARCH_RESULT': self.handle_event_search_result, 'RESOURCE_CONFLICT': self.handle_event_resource_conflict, - 'PEP_ACCESS_MODEL': self.handle_event_pep_access_model, + 'PEP_CONFIG': self.handle_event_pep_config, 'UNIQUE_ROOM_ID_UNSUPPORTED': \ self.handle_event_unique_room_id_unsupported, 'UNIQUE_ROOM_ID_SUPPORTED': self.handle_event_unique_room_id_supported,

1 0

[commit-gajim] r9330 - trunk/src
by asterix＠gajim.org 15 Feb '08

15 Feb '08

Author: asterix Date: 2008-02-15 11:38:52 +0100 (Fri, 15 Feb 2008) New Revision: 9330 Modified: trunk/src/adhoc_commands.py Log: Make some strings translatable in adhoc commands, Warn user when session id changes in the middle of a session. fixes #3432 Modified: trunk/src/adhoc_commands.py =================================================================== --- trunk/src/adhoc_commands.py 2008-02-15 10:11:17 UTC (rev 9329) +++ trunk/src/adhoc_commands.py 2008-02-15 10:38:52 UTC (rev 9330) @@ -110,7 +110,7 @@ return self.stage_adhoc_commands_window_delete_event(self.window) def __del__(self): - print "Object has been deleted." + print 'Object has been deleted.' # stage 1: waiting for command list def stage1(self): @@ -248,8 +248,8 @@ return False dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, - gtk.BUTTONS_YES_NO, 'Cancel confirmation', - 'You are in process of executing command. Do you really want to cancel it?') + gtk.BUTTONS_YES_NO, _('Cancel confirmation'), + _('You are in process of executing command. Do you really want to cancel it?')) dialog.popup() if dialog.get_response()==gtk.RESPONSE_YES: self.send_cancel() @@ -291,7 +291,11 @@ self.remove_pulsing() self.sending_form_progressbar.hide() - self.sessionid = command.getAttr('sessionid') + if not self.sessionid: + self.sessionid = command.getAttr('sessionid') + elif self.sessionid != command.getAttr('sessionid'): + self.stage5(error=_('Service changed the session identifier.'), + senderror=True) self.form_status = command.getAttr('status') @@ -303,12 +307,11 @@ try: self.data_form_widget.data_form=self.dataform except dataforms.Error: - # FIXME: translate - self.stage5(error='Service sent malformed data', senderror=True) + self.stage5(error=_('Service sent malformed data'), senderror=True) return self.data_form_widget.show() if self.data_form_widget.title: - self.window.set_title("%s - Ad-hoc Commands - Gajim" % \ + self.window.set_title('%s - Ad-hoc Commands - Gajim' % \ self.data_form_widget.title) else: self.data_form_widget.hide() @@ -385,7 +388,7 @@ error = errordesc.decode('utf-8') del errorname, errordesc except KeyError: # when stanza doesn't have error description - error = 'Service returned an error.' + error = _('Service returned an error.') elif error: # we've got error message pass

1 0

[commit-gajim] r9329 - in trunk/src: . common
by asterix＠gajim.org 15 Feb '08

15 Feb '08

Author: asterix Date: 2008-02-15 11:11:17 +0100 (Fri, 15 Feb 2008) New Revision: 9329 Modified: trunk/src/common/config.py trunk/src/common/connection.py trunk/src/dialogs.py trunk/src/gajim.py Log: ability to ignore SSL errors until certificate changes. Fixes #3710 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-02-14 23:16:59 UTC (rev 9328) +++ trunk/src/common/config.py 2008-02-15 10:11:17 UTC (rev 9329) @@ -285,6 +285,7 @@ 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'warn_when_insecure_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an insecure connection.') ], 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], + 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], 'use_custom_host': [ opt_bool, False, '', True ], 'custom_port': [ opt_int, 5222, '', True ], Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-02-14 23:16:59 UTC (rev 9328) +++ trunk/src/common/connection.py 2008-02-15 10:11:17 UTC (rev 9329) @@ -618,7 +618,8 @@ errnum = con.Connection.ssl_errnum except AttributeError: errnum = -1 # we don't have an errnum - if errnum > 0: + if errnum > 0 and str(errnum) not in gajim.config.get_per('accounts', + self.name, 'ignore_ssl_errors'): text = _('The authenticity of the %s certificate could be invalid.') %\ hostname if errnum in ssl_error: Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-02-14 23:16:59 UTC (rev 9328) +++ trunk/src/dialogs.py 2008-02-15 10:11:17 UTC (rev 9329) @@ -1305,6 +1305,67 @@ ''' Get active state of the checkbutton ''' return self.checkbutton.get_active() +class ConfirmationDialogDubbleCheck(ConfirmationDialog): + '''HIG compliant confirmation dialog with 2 checkbuttons.''' + def __init__(self, pritext, sectext='', checktext1 = '', checktext2 = '', + on_response_ok = None, on_response_cancel = None, is_modal = True): + self.user_response_ok = on_response_ok + self.user_response_cancel = on_response_cancel + + HigDialog.__init__(self, None, gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, + self.on_response_cancel) + + self.set_default_response(gtk.RESPONSE_OK) + + ok_button = self.action_area.get_children()[0] # right to left + ok_button.grab_focus() + + if checktext1: + self.checkbutton1 = gtk.CheckButton(checktext1) + self.vbox.pack_start(self.checkbutton1, expand = False, fill = True) + else: + self.checkbutton1 = None + if checktext2: + self.checkbutton2 = gtk.CheckButton(checktext2) + self.vbox.pack_start(self.checkbutton2, expand = False, fill = True) + else: + self.checkbutton2 = None + + self.set_modal(is_modal) + self.popup() + + # XXX should cancel if somebody closes the dialog + + def on_response_ok(self, widget): + if self.user_response_ok: + if isinstance(self.user_response_ok, tuple): + self.user_response_ok[0](self.is_checked(), + *self.user_response_ok[1:]) + else: + self.user_response_ok(self.is_checked()) + self.destroy() + + def on_response_cancel(self, widget): + if self.user_response_cancel: + if isinstance(self.user_response_cancel, tuple): + self.user_response_cancel[0](*self.user_response_cancel[1:]) + else: + self.user_response_cancel() + self.destroy() + + def is_checked(self): + ''' Get active state of the checkbutton ''' + if self.checkbutton1: + is_checked_1 = self.checkbutton1.get_active() + else: + is_checked_1 = False + if self.checkbutton2: + is_checked_2 = self.checkbutton2.get_active() + else: + is_checked_2 = False + return [is_checked_1, is_checked_2] + class FTOverwriteConfirmationDialog(ConfirmationDialog): '''HIG compliant confirmation dialog to overwrite or resume a file transfert''' def __init__(self, pritext, sectext='', propose_resume=True): Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-14 23:16:59 UTC (rev 9328) +++ trunk/src/gajim.py 2008-02-15 10:11:17 UTC (rev 9329) @@ -2218,8 +2218,9 @@ def handle_event_ssl_error(self, account, data): # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint)) server = gajim.config.get_per('accounts', account, 'hostname') - def on_ok(is_checked=False): - if is_checked: + + def on_ok(is_checked): + if is_checked[0]: # Check if cert is already in file certs = '' if os.path.isfile(gajim.MY_CACERTS): @@ -2236,25 +2237,35 @@ f.close() gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', data[3]) + if is_checked[1]: + ignore_ssl_errors = gajim.config.get_per('accounts', account, + 'ignore_ssl_errors').split() + ignore_ssl_errors.append(str(data[1])) + gajim.config.set_per('accounts', account, 'ignore_ssl_errors', + ' '.join(ignore_ssl_errors)) gajim.connections[account].ssl_certificate_accepted() + def on_cancel(): gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') + pritext = _('Error verifying SSL certificate') sectext = _('There was an error verifying the SSL certificate of your jabber server: %(error)s\nDo you still want to connect to this server?') % {'error': data[0]} if data[1] in (18, 27): - checktext = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % data[3] - dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, - on_response_ok=on_ok, on_response_cancel=on_cancel) + checktext1 = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % data[3] else: - dialogs.ConfirmationDialog(pritext, sectext, - on_response_ok=on_ok, on_response_cancel=on_cancel) + checktext1 = '' + checktext2 = _('Ignore this error for this certificate.') + dialogs.ConfirmationDialogDubbleCheck(pritext, sectext, checktext1, + checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel) def handle_event_fingerprint_error(self, account, data): # ('FINGERPRINT_ERROR', account, (new_fingerprint,)) def on_yes(is_checked): gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', data[0]) + # Reset the ignored ssl errors + gajim.config.set_per('accounts', account, 'ignore_ssl_errors', '') gajim.connections[account].ssl_certificate_accepted() def on_no(): gajim.connections[account].disconnect(on_purpose=True)

1 0

[commit-gajim] r9328 - trunk/po
by asterix＠gajim.org 14 Feb '08

14 Feb '08

Author: asterix Date: 2008-02-15 00:16:59 +0100 (Fri, 15 Feb 2008) New Revision: 9328 Modified: trunk/po/de.po Log: [Betz Stefan] some more german translation. Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2008-02-14 19:18:07 UTC (rev 9327) +++ trunk/po/de.po 2008-02-14 23:16:59 UTC (rev 9328) @@ -104,6 +104,8 @@ "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" +"Dieses Zertifikat der Liste von Vertrauenswürdigen Zertifikaten hinzufügen\n" +"SHA1 Fingerabdruck von dem Zertifikat:\n" #: ../data/glade/account_creation_wizard_window.glade.h:10 msgid "Click to see features (like MSN, ICQ transports) of jabber servers" @@ -597,7 +599,7 @@ #: ../data/glade/accounts_window.glade.h:62 msgid "use HTTP_PROXY environment variable" -msgstr "" +msgstr "Umgebungsvariable HTTP_PROXY benutzen" #: ../data/glade/add_new_contact_window.glade.h:1 msgid "A_ccount:"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008