Commits

commits@gajim.org

17632 discussions

gajim: correctly place tooltips
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset d1f06e203e45 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1f06e203e45 description: correctly place tooltips diffstat: src/roster_window.py | 2 +- src/tooltips.py | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diffs (65 lines): diff -r 88fd3f2d7b80 -r d1f06e203e45 src/roster_window.py --- a/src/roster_window.py Fri Dec 28 21:58:49 2012 +0100 +++ b/src/roster_window.py Fri Dec 28 21:59:20 2012 +0100 @@ -2045,7 +2045,7 @@ # position of the treeview on the screen position = self.tree.get_window().get_origin() - self.tooltip.show_tooltip(contact, rect.height, position[1] + \ + self.tooltip.show_tooltip(contact, rect.height, position[2] + \ rect.y) else: self.tooltip.hide_tooltip() diff -r 88fd3f2d7b80 -r d1f06e203e45 src/tooltips.py --- a/src/tooltips.py Fri Dec 28 21:58:49 2012 +0100 +++ b/src/tooltips.py Fri Dec 28 21:59:20 2012 +0100 @@ -93,8 +93,7 @@ self.win.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) self.win.set_events(Gdk.EventMask.POINTER_MOTION_MASK) -# self.win.connect_after('draw', self.on_draw) -# self.win.connect('size-request', self.on_size_request) + self.win.connect('size-allocate', self.on_size_allocate) self.win.connect('motion-notify-event', self.motion_notify_event) self.screen = self.win.get_screen() @@ -114,32 +113,22 @@ def motion_notify_event(self, widget, event): self.hide_tooltip() - def on_size_request(self, widget, requisition): - half_width = requisition.width / 2 + 1 + def on_size_allocate(self, widget, rect): + half_width = rect.width / 2 + 1 if self.preferred_position[0] < half_width: self.preferred_position[0] = 0 - elif self.preferred_position[0] + requisition.width > \ - self.screen.get_width() + half_width: - self.preferred_position[0] = self.screen.get_width() - \ - requisition.width + elif self.preferred_position[0] + rect.width > \ + self.screen.get_width() + half_width: + self.preferred_position[0] = self.screen.get_width() - rect.width elif not self.check_last_time: self.preferred_position[0] -= half_width - if self.preferred_position[1] + requisition.height > \ - self.screen.get_height(): + if self.preferred_position[1] + rect.height > self.screen.get_height(): # flip tooltip up - self.preferred_position[1] -= requisition.height + \ - self.widget_height + 8 + self.preferred_position[1] -= rect.height + self.widget_height + 8 if self.preferred_position[1] < 0: self.preferred_position[1] = 0 self.win.move(self.preferred_position[0], self.preferred_position[1]) -# def expose(self, widget, event): -# style = self.win.get_style() -# size = self.win.get_size() -# style.paint_shadow(self.win.window, Gtk.StateType.NORMAL, Gtk.ShadowType.OUT, -# None, self.win, 'tooltip', 0, 0, size[0], size[1]) -# return True - def show_tooltip(self, data, widget_height, widget_y_position): """ Show tooltip on widget

1 0

gajim: update README
by Yann Leboulanger 28 Dec '12

28 Dec '12

changeset 88fd3f2d7b80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88fd3f2d7b80 description: update README diffstat: README.html | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (24 lines): diff -r 897914764015 -r 88fd3f2d7b80 README.html --- a/README.html Thu Dec 27 21:58:52 2012 +0100 +++ b/README.html Fri Dec 28 21:58:49 2012 +0100 @@ -14,8 +14,9 @@ <h2>Runtime Requirements</h2> <ul> -<li>python2.5 or higher</li> -<li>pygtk2.22 or higher</li> +<li>python2.7 or higher</li> +<li>python-gi</li> +<li>gir1.2-gtk-3.0</li> <li>python-nbxmpp</li> </ul> @@ -28,7 +29,7 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li> +<li>gir1.2-gnomekeyring-1.0 for GnomeKeyring support as password storage</li> <li>kwalletcli (for support of KDE Wallet as password storage)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>

1 0

python-nbxmpp: prefer sha-1
by Jefry Lagrange 27 Dec '12

27 Dec '12

changeset b339386c6111 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b339386c6111 description: prefer sha-1 diffstat: nbxmpp/protocol.py | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diffs (44 lines): diff -r 5812cedb80f0 -r b339386c6111 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Mon Dec 24 14:55:21 2012 -0400 +++ b/nbxmpp/protocol.py Thu Dec 27 19:17:02 2012 -0400 @@ -1070,34 +1070,30 @@ hash_ = None # file_string can be a string or a file if type(file_string) == str: # if it is a string - if algo == 'md5': + if algo == 'sha-1': + hl = hashlib.sha1() + elif algo == 'md5': hl = hashlib.md5() - elif algo == 'sha-1': - hl = hashlib.sha1() elif algo == 'sha-256': hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file - - if algo == 'md5': + if algo == 'sha-1': + hl = hashlib.sha1() + elif algo == 'md5': hl = hashlib.md5() - elif algo == 'sha-1': - hl = hashlib.sha1() elif algo == 'sha-256': hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest() - return hash_ def addHash(self, hash_, algo):

1 0

gajim: more GTK3 fixes
by Yann Leboulanger 27 Dec '12

27 Dec '12

changeset 897914764015 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=897914764015 description: more GTK3 fixes diffstat: data/gui/add_new_contact_window.ui | 103 +++++++++--- data/gui/dubbleinput_dialog.ui | 114 +++++++----- data/gui/esession_info_window.ui | 144 +++++++++------- data/gui/input_dialog.ui | 115 +++++++----- data/gui/input_text_dialog.ui | 116 +++++++----- data/gui/roster_window.ui | 313 +++++++++++++++++++++++------------- src/chat_control.py | 12 +- src/conversation_textview.py | 6 +- src/dialogs.py | 8 +- src/disco.py | 2 +- src/filetransfers_window.py | 4 +- src/groupchat_control.py | 6 +- src/gtkgui_helpers.py | 21 +- src/history_manager.py | 2 +- src/htmltextview.py | 2 +- src/message_window.py | 8 +- src/profile_window.py | 2 +- src/roster_window.py | 20 +- src/statusicon.py | 3 +- src/tooltips.py | 16 +- src/vcard.py | 4 +- 21 files changed, 611 insertions(+), 410 deletions(-) diffs (truncated from 2282 to 300 lines): diff -r fedfe3ab9886 -r 897914764015 data/gui/add_new_contact_window.ui --- a/data/gui/add_new_contact_window.ui Thu Dec 27 00:11:48 2012 +0100 +++ b/data/gui/add_new_contact_window.ui Thu Dec 27 21:58:52 2012 +0100 @@ -1,22 +1,23 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> -  +  <object class="GtkWindow" id="add_new_contact_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Add New Contact</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_add_new_contact_window_destroy"/> - <signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/> + <signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -27,10 +28,12 @@ <child> <object class="GtkHBox" id="account_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="account_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">A_ccount:</property> <property name="use_underline">True</property> @@ -44,8 +47,9 @@ <child> <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="model">liststore3</property> - <signal name="changed" handler="on_account_combobox_changed"/> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext3"/> <attributes> @@ -64,16 +68,20 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="protocol_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="protocol_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Protocol:</property> <property name="use_underline">True</property> @@ -88,7 +96,8 @@ <child> <object class="GtkComboBox" id="protocol_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_protocol_combobox_changed"/> + <property name="can_focus">False</property> + <signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -99,9 +108,10 @@ <child> <object class="GtkComboBox" id="protocol_jid_combobox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="model">liststore2</property> - <signal name="changed" handler="on_protocol_jid_combobox_changed"/> + <signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> @@ -110,17 +120,22 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkTable" id="subscription_table"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -130,6 +145,7 @@ <child> <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_User ID:</property> <property name="use_underline">True</property> @@ -137,7 +153,7 @@ </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -145,16 +161,18 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text">Type User ID</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label188"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Nickname:</property> <property name="use_underline">True</property> @@ -164,7 +182,7 @@ <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> @@ -172,18 +190,20 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="activates_default">True</property> + <property name="placeholder_text">Type Nickname</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label223"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Group:</property> <property name="use_underline">True</property> @@ -192,37 +212,48 @@ <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <object class="GtkComboBoxEntry" id="group_comboboxentry"> + <object class="GtkComboBoxText" id="group_comboboxentry"> <property name="visible">True</property> - <property name="model">groups_liststore</property> - <property name="text_column">0</property> + <property name="can_focus">False</property> + <property name="has_entry">True</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="placeholder_text">Choose a group of type a new group</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="auto_authorize_checkbutton"> <property name="label" translatable="yes">A_llow this contact to view my status</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </object> @@ -238,9 +269,8 @@ <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="border_width">6</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">etched-in</property> + <property name="min_content_height">5</property> <child> <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> @@ -251,30 +281,39 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">5</property> </packing> </child> <child> <object class="GtkCheckButton" id="save_message_checkbutton"> <property name="label" translatable="yes">_Save subscription message</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> <child> <object class="GtkHBox" id="register_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label224"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this @@ -283,18 +322,22 @@ <property name="wrap">True</property> </object> <packing>

1 0

gajim: prevent traceback
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset fedfe3ab9886 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fedfe3ab9886 description: prevent traceback diffstat: src/config.py | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 9 deletions(-) diffs (114 lines): diff -r 755703ea1187 -r fedfe3ab9886 src/config.py --- a/src/config.py Thu Dec 27 00:02:51 2012 +0100 +++ b/src/config.py Thu Dec 27 00:11:48 2012 +0100 @@ -1215,7 +1215,10 @@ model.set_value(iter_, 0, new_text) def on_msg_treeview_cursor_changed(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return self.xml.get_object('delete_msg_button').set_sensitive(True) @@ -1230,7 +1233,10 @@ self.msg_tree.set_cursor(model.get_path(iter_)) def on_delete_msg_button_clicked(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return buf = self.xml.get_object('msg_textview').get_buffer() @@ -1239,7 +1245,10 @@ self.xml.get_object('delete_msg_button').set_sensitive(False) def on_msg_textview_changed(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return buf = self.xml.get_object('msg_textview').get_buffer() @@ -1357,7 +1366,10 @@ self.proxies_treeview.set_cursor(model.get_path(iter_)) def on_remove_proxy_button_clicked(self, widget): - (model, iter_) = self.proxies_treeview.get_selection().get_selected() + sel = self.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return proxy = model[iter_][0].decode('utf-8') @@ -1412,7 +1424,11 @@ #useauth_checkbutton.set_active(False) #self.on_useauth_checkbutton_toggled(useauth_checkbutton) - (model, iter_) = widget.get_selection().get_selected() + sel = widget.get_selection() + if sel: + (model, iter_) = sel.get_selected() + else: + iter_ = None if not iter_: self.xml.get_object('proxyname_entry').set_text('') self.xml.get_object('proxytype_combobox').set_sensitive(False) @@ -1463,7 +1479,10 @@ def on_proxyname_entry_changed(self, widget): if self.block_signal: return - (model, iter_) = self.proxies_treeview.get_selection().get_selected() + sel = self.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return old_name = model.get_value(iter_, 0).decode('utf-8') @@ -4182,8 +4201,12 @@ model.append((enabled, sound_ui_name, path, sound_event_config_name)) def on_treeview_sounds_cursor_changed(self, widget, data = None): - (model, iter_) = self.sound_tree.get_selection().get_selected() sounds_entry = self.xml.get_object('sounds_entry') + sel = self.sound_tree.get_selection() + if not sel: + sounds_entry.set_text('') + return + (model, iter_) = sel.get_selected() if not iter_: sounds_entry.set_text('') return @@ -4191,7 +4214,10 @@ sounds_entry.set_text(path_to_snd_file) def on_browse_for_sounds_button_clicked(self, widget, data = None): - (model, iter_) = self.sound_tree.get_selection().get_selected() + sel = self.sound_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return def on_ok(widget, path_to_snd_file): @@ -4223,7 +4249,10 @@ model[iter_][2] = path_to_snd_file # set new path to sounds_model def on_play_button_clicked(self, widget): - model, iter_ = self.sound_tree.get_selection().get_selected() + sel = self.sound_tree.get_selection() + if not sel: + return + model, iter_ = sel.get_selected() if not iter_: return snd_event_config_name = model[iter_][3]

1 0

gajim: gtkspell is now ok
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 755703ea1187 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=755703ea1187 description: gtkspell is now ok diffstat: src/gtkspell.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r d79d51d6a726 -r 755703ea1187 src/gtkspell.py --- a/src/gtkspell.py Wed Dec 26 23:55:53 2012 +0100 +++ b/src/gtkspell.py Thu Dec 27 00:02:51 2012 +0100 @@ -19,7 +19,7 @@ import ctypes import ctypes.util -import gtk +from gi.repository import Gtk gboolean = ctypes.c_int @@ -63,8 +63,8 @@ class Spell(object): def __init__(self, textview, language=None, create=True): - if not isinstance(textview, gtk.TextView): - raise TypeError("Textview must be derived from gtk.TextView") + if not isinstance(textview, Gtk.TextView): + raise TypeError("Textview must be derived from Gtk.TextView") tv = PyGObject.from_address(id(textview)).obj spell = libgtkspell.gtkspell_get_from_text_view(tv) if create:

1 0

gajim: remove session mnagement broken support
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset d79d51d6a726 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d79d51d6a726 description: remove session mnagement broken support diffstat: src/features_window.py | 15 +-------------- src/gajim.py | 26 -------------------------- 2 files changed, 1 insertions(+), 40 deletions(-) diffs (74 lines): diff -r 74df14635891 -r d79d51d6a726 src/features_window.py --- a/src/features_window.py Wed Dec 26 23:39:22 2012 +0100 +++ b/src/features_window.py Wed Dec 26 23:55:53 2012 +0100 @@ -67,10 +67,6 @@ _('Autodetection of network status.'), _('Requires gnome-network-manager and python-dbus.'), _('Feature not available under Windows.')), - _('Session Management'): (self.session_management_available, - _('Gajim session is stored on logout and restored on login.'), - _('Requires python-gnome2.'), - _('Feature not available under Windows.')), _('Password encryption'): (self.some_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), @@ -192,22 +188,13 @@ import network_manager_listener return network_manager_listener.supported - def session_management_available(self): - if os.name == 'nt': - return False - try: - __import__('gnome.ui') - except Exception: - return False - return True - def some_keyring_available(self): if os.name == 'nt': return False if kwalletbinding.kwallet_available(): return True try: - __import__('gnomekeyring') + from gi.repository import GnomeKeyring except Exception: return False return True diff -r 74df14635891 -r d79d51d6a726 src/gajim.py --- a/src/gajim.py Wed Dec 26 23:39:22 2012 +0100 +++ b/src/gajim.py Wed Dec 26 23:55:53 2012 +0100 @@ -449,32 +449,6 @@ log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \ sys.getfilesystemencoding(), locale.getpreferredencoding()) - #if os.name != 'nt': - ## Session Management support - #try: - #import gnome.ui - #raise ImportError - #except ImportError: - #pass - #else: - #def die_cb(dummy): - #gajim.interface.roster.quit_gtkgui_interface() - #gnome.program_init('gajim', gajim.version) - #cli = gnome.ui.master_client() - #cli.connect('die', die_cb) - - #path_to_gajim_script = gtkgui_helpers.get_abspath_for_script( - #'gajim') - - #if path_to_gajim_script: - #argv = [path_to_gajim_script] - #try: - #cli.set_restart_command(argv) - #except TypeError: - ## Fedora systems have a broken gnome-python wrapper for this - ## function. - #cli.set_restart_command(len(argv), argv) - check_paths.check_and_possibly_create_paths() interface = Interface()

1 0

gajim: Cancel an IBB transfer
by Jefry Lagrange 26 Dec '12

26 Dec '12

changeset ef9f5c22d2c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ef9f5c22d2c2 description: Cancel an IBB transfer diffstat: src/common/protocol/bytestream.py | 19 ++++++++++++++++++- src/filetransfers_window.py | 6 +++++- 2 files changed, 23 insertions(+), 2 deletions(-) diffs (67 lines): diff -r e5fc5cf2b012 -r ef9f5c22d2c2 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/common/protocol/bytestream.py Wed Dec 26 18:41:31 2012 -0400 @@ -803,6 +803,16 @@ file_props.fp = open(file_props.file_name, 'w') conn.send(rep) + def CloseIBBStream(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid':file_props.sid})])) + + def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -849,6 +859,9 @@ if file_props.direction[0] == '>': if file_props.paused: continue + if not file_props.connected: + #TODO: Reply with out of order error + continue chunk = file_props.fp.read(file_props.block_size) if chunk: datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', {'sid': sid, @@ -939,6 +952,9 @@ reply.delChild('close') conn.send(reply) file_props.fp.close() + file_props.completed = file_props.received_len >= file_props.size + if not file_props.completed: + file_props.error = -1 gajim.socks5queue.complete_transfer_cb(self.name, file_props) else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) @@ -953,8 +969,9 @@ syn_id = stanza.getID() log.debug('IBBAllIqHandler called syn_id->%s' % syn_id) for file_props in FilesProp.getAllFileProp(): - if not file_props.direction: + if not file_props.direction or not file_props.connected: # It's socks5 bytestream + # Or we closed the IBB stream continue if file_props.syn_id == syn_id: if stanza.getType() == 'error': diff -r e5fc5cf2b012 -r ef9f5c22d2c2 src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/filetransfers_window.py Wed Dec 26 18:41:31 2012 -0400 @@ -943,7 +943,11 @@ account = file_props.tt_account if account not in gajim.connections: return - gajim.connections[account].disconnect_transfer(file_props) + con = gajim.connections[account] + # Check if we are in a IBB transfer + if file_props.direction: + con.CloseIBBStream(file_props) + con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') def show_tooltip(self, widget):

1 0

gajim: use gobject introspection to access gupnp-igd
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 74df14635891 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74df14635891 description: use gobject introspection to access gupnp-igd diffstat: src/common/gajim.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (15 lines): diff -r 27bada70aae0 -r 74df14635891 src/common/gajim.py --- a/src/common/gajim.py Wed Dec 26 23:08:26 2012 +0100 +++ b/src/common/gajim.py Wed Dec 26 23:39:22 2012 +0100 @@ -191,9 +191,8 @@ HAVE_UPNP_IGD = True try: - raise ImportError - import gupnp.igd - gupnp_igd = gupnp.igd.Simple() + from gi.repository import GUPnPIgd + gupnp_igd = GUPnPIgd.SimpleIgd() except ImportError: HAVE_UPNP_IGD = False

1 0

gajim: use gobject introspection to access gconf
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 27bada70aae0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27bada70aae0 description: use gobject introspection to access gconf diffstat: src/command_system/tools.py | 13 ++++++------- src/gtkgui_helpers.py | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diffs (63 lines): diff -r 48fe995edbdc -r 27bada70aae0 src/command_system/tools.py --- a/src/command_system/tools.py Wed Dec 26 11:19:59 2012 +0100 +++ b/src/command_system/tools.py Wed Dec 26 23:08:26 2012 +0100 @@ -25,7 +25,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from types import * -#from glib import GError def remove(sequence, target): if isinstance(sequence, ListType): @@ -36,9 +35,9 @@ del sequence[target] def gconf(path): -# try: -# from gconf import client_get_default -# client = client_get_default() -# return client.get_string(path) -# except ImportError, GError: - pass \ No newline at end of file + try: + from gi.repository import GConf + client = GConf.Client.get_default() + return client.get_string(path) + except ImportError: + pass diff -r 48fe995edbdc -r 27bada70aae0 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Dec 26 11:19:59 2012 +0100 +++ b/src/gtkgui_helpers.py Wed Dec 26 23:08:26 2012 +0100 @@ -31,7 +31,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -import glib from gi.repository import GObject from gi.repository import Pango import os @@ -175,11 +174,11 @@ Xfce and last KDE it returns None on failure or else a string 'Font Size' """ try: - from gconf import client_get_default - client = client_get_default() + from gi.repository import GConf + client = GConf.Client.get_default() value = client.get_string("/desktop/gnome/interface/font_name") return value.decode("utf8") - except ImportError, glib.GError: + except ImportError: pass # try to get Xfce default font @@ -833,7 +832,7 @@ # Save image try: pixbuf.save(file_path, image_format) - except glib.GError, e: + except Exception, e: log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits