Commits October 2010

commits@gajim.org

2 participants
111 discussions

gajim: remove useless raise
by Yann Leboulanger 28 Oct '10

28 Oct '10

changeset abfc35a37d0c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=abfc35a37d0c description: remove useless raise diffstat: src/gajim.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 1da385987b92 -r abfc35a37d0c src/gajim.py --- a/src/gajim.py Thu Oct 28 13:18:37 2010 +0200 +++ b/src/gajim.py Thu Oct 28 21:00:48 2010 +0200 @@ -403,7 +403,6 @@ # Session Management support try: import gnome.ui - raise ImportError except ImportError: pass else:

1 0

gajim: fix typo
by Yann Leboulanger 28 Oct '10

28 Oct '10

changeset 1da385987b92 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1da385987b92 description: fix typo diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c51a530a87d5 -r 1da385987b92 src/gajim.py --- a/src/gajim.py Wed Oct 27 19:37:14 2010 +0200 +++ b/src/gajim.py Thu Oct 28 13:18:37 2010 +0200 @@ -54,7 +54,7 @@ import ctypes.util libintl_path = ctypes.util.find_library('intl') if libintl_path == None: - local_intl = ok.path.join('gtk', 'bin', 'intl.dll') + local_intl = os.path.join('gtk', 'bin', 'intl.dll') if os.path.exists(local_intl): libintl_path = local_intl if libintl_path == None:

1 0

gajim: e NEC to handle jingle-connected events
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset c51a530a87d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c51a530a87d5 description: e NEC to handle jingle-connected events diffstat: src/common/connection_handlers_events.py | 14 ++++++++++++-- src/common/jingle.py | 2 -- src/common/jingle_session.py | 10 +++++----- src/gui_interface.py | 22 ++++++++++------------ 4 files changed, 27 insertions(+), 21 deletions(-) diffs (123 lines): diff -r f1eb2e6704f3 -r c51a530a87d5 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Oct 27 11:39:45 2010 +0200 +++ b/src/common/connection_handlers_events.py Wed Oct 27 19:37:14 2010 +0200 @@ -1114,8 +1114,18 @@ name = 'anonymous-auth' base_network_events = [] -class JingleReceivedEvent(nec.NetworkIncomingEvent): - name = 'jingle-received' +class JingleRequestReceivedEvent(nec.NetworkIncomingEvent): + name = 'jingle-request-received' + base_network_events = [] + + def generate(self): + self.fjid = self.jingle_session.peerjid + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + self.sid = self.jingle_session.sid + return True + +class JingleConnectedReceivedEvent(nec.NetworkIncomingEvent): + name = 'jingle-connected-received' base_network_events = [] def generate(self): diff -r f1eb2e6704f3 -r c51a530a87d5 src/common/jingle.py --- a/src/common/jingle.py Wed Oct 27 11:39:45 2010 +0200 +++ b/src/common/jingle.py Wed Oct 27 19:37:14 2010 +0200 @@ -145,8 +145,6 @@ else: return None elif media: - if media not in ('audio', 'video'): - return None for session in self._sessions.values(): if session.peerjid == jid and session.get_content(media): return session diff -r f1eb2e6704f3 -r c51a530a87d5 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Oct 27 11:39:45 2010 +0200 +++ b/src/common/jingle_session.py Wed Oct 27 19:37:14 2010 +0200 @@ -30,7 +30,7 @@ import xmpp from jingle_transport import get_jingle_transport from jingle_content import get_jingle_content, JingleContentSetupException -from common.connection_handlers_events import JingleReceivedEvent +from common.connection_handlers_events import * # FIXME: Move it to JingleSession.States? class JingleStates(object): @@ -408,7 +408,7 @@ self.__content_reject(content) self.contents[(content.creator, content.name)].destroy() - gajim.nec.push_incoming_event(JingleReceivedEvent(None, + gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, conn=self.connection, jingle_session=self, contents=contents)) def __on_session_initiate(self, stanza, jingle, error, action): @@ -454,7 +454,7 @@ self.state = JingleStates.pending # Send event about starting a session - gajim.nec.push_incoming_event(JingleReceivedEvent(None, + gajim.nec.push_incoming_event(JingleRequestReceivedEvent(None, conn=self.connection, jingle_session=self, contents=contents)) def __broadcast(self, stanza, jingle, error, action): @@ -675,5 +675,5 @@ (self.peerjid, self.sid, content.media, 'removed')) def content_negotiated(self, media): - self.connection.dispatch('JINGLE_CONNECTED', (self.peerjid, self.sid, - media)) + gajim.nec.push_incoming_event(JingleConnectedReceivedEvent(None, + conn=self.connection, jingle_session=self, media=media)) diff -r f1eb2e6704f3 -r c51a530a87d5 src/gui_interface.py --- a/src/gui_interface.py Wed Oct 27 11:39:45 2010 +0200 +++ b/src/gui_interface.py Wed Oct 27 19:37:14 2010 +0200 @@ -1543,19 +1543,17 @@ notify.popup(event_type, obj.fjid, account, 'jingle-incoming', path_to_image=path, title=event_type, text=txt) - def handle_event_jingle_connected(self, account, data): + def handle_event_jingle_connected(self, obj): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) - peerjid, sid, media = data - if media in ('audio', 'video'): - jid = gajim.get_jid_without_resource(peerjid) - resource = gajim.get_resource_from_jid(peerjid) - ctrl = (self.msg_win_mgr.get_control(peerjid, account) - or self.msg_win_mgr.get_control(jid, account)) + if obj.media in ('audio', 'video'): + account = obj.conn.name + ctrl = (self.msg_win_mgr.get_control(obj.fjid, account) + or self.msg_win_mgr.get_control(obj.jid, account)) if ctrl: - if media == 'audio': - ctrl.set_audio_state('connected', sid) + if obj.media == 'audio': + ctrl.set_audio_state('connected', obj.sid) else: - ctrl.set_video_state('connected', sid) + ctrl.set_video_state('connected', obj.sid) def handle_event_jingle_disconnected(self, account, data): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) @@ -1892,7 +1890,6 @@ 'INSECURE_SSL_CONNECTION': \ [self.handle_event_insecure_ssl_connection], 'INSECURE_PASSWORD': [self.handle_event_insecure_password], - 'JINGLE_CONNECTED': [self.handle_event_jingle_connected], 'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected], 'JINGLE_ERROR': [self.handle_event_jingle_error], 'PEP_RECEIVED': [self.handle_event_pep_received], @@ -1905,7 +1902,8 @@ 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth], 'iq-error-received': [self.handle_event_iq_error], - 'jingle-received': [self.handle_event_jingle_incoming], + 'jingle-connected-received': [self.handle_event_jingle_connected], + 'jingle-request-received': [self.handle_event_jingle_incoming], 'last-result-received': [self.handle_event_last_status_time], 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config],

1 0

gajim: put (group)chat controls in a hbox to be more extensible
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset f1eb2e6704f3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1eb2e6704f3 description: put (group)chat controls in a hbox to be more extensible diffstat: data/gui/chat_control.ui | 1089 ++++++++++++++++++++-------------------- data/gui/groupchat_control.ui | 800 +++++++++++++++-------------- src/message_control.py | 2 +- 3 files changed, 954 insertions(+), 937 deletions(-) diffs (truncated from 2067 to 300 lines): diff -r 2a32529b310b -r f1eb2e6704f3 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Wed Oct 27 10:28:59 2010 +0200 +++ b/data/gui/chat_control.ui Wed Oct 27 11:39:45 2010 +0200 @@ -2,117 +2,177 @@ <interface> <requires lib="gtk+" version="2.16"/>  - <object class="GtkVBox" id="chat_control_vbox"> + <object class="GtkHBox" id="chat_control_hbox"> <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="orientation">vertical</property> <property name="spacing">1</property> <child> - <object class="GtkVBox" id="vbox2"> - <property name="visible">True</property> + <object class="GtkVBox" id="chat_control_vbox"> + <property name="can_focus">True</property> + <property name="border_width">3</property> <property name="orientation">vertical</property> + <property name="spacing">1</property> <child> - <object class="GtkAlignment" id="alignment"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="left_padding">3</property> - <property name="right_padding">3</property> + <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> + <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="left_padding">3</property> + <property name="right_padding">3</property> <child> - <object class="GtkHBox" id="hbox3004"> + <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> <child> - <object class="GtkImage" id="banner_status_image"> + <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> - <property name="ypad">5</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="banner_vbox"> - <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="border_width">5</property> - <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="banner_name_label"> + <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label"><span weight="heavy" size="large">Contact name</span></property> - <property name="use_markup">True</property> + <property name="ypad">5</property> + <property name="stock">gtk-missing-image</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">5</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="banner_label"> + <object class="GtkVBox" id="banner_vbox"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">label</property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="mood_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="activity_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="border_width">5</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="banner_name_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label"><span weight="heavy" size="large">Contact name</span></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="banner_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">label</property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">1</property> </packing> </child> <child> - <object class="GtkImage" id="tune_image"> - <property name="no_show_all">True</property> - <property name="stock">None</property> - <property name="icon-size">1</property> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkImage" id="mood_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="activity_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="tune_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="location_eventbox"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <object class="GtkImage" id="location_image"> + <property name="no_show_all">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="audio_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkImage" id="video_banner_image"> + <property name="visible">True</property> + <property name="stock">None</property> + <property name="icon-size">1</property> + </object> + <packing> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="width_request">11</property> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">6</property> + </packing> + </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkEventBox" id="location_eventbox"> + <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> <child> - <object class="GtkImage" id="location_image"> - <property name="no_show_all">True</property> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> <property name="stock">None</property> - <property name="icon-size">1</property> </object> </child> </object> @@ -122,109 +182,107 @@ <property name="position">3</property> </packing> </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox106"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="height_request">60</property> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkButton" id="authentication_button"> + <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="no_show_all">True</property>

1 0

gajim: change attributes in jingle Event
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset 2a32529b310b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2a32529b310b description: change attributes in jingle Event diffstat: src/common/connection_handlers_events.py | 3 ++- src/gui_interface.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diffs (60 lines): diff -r 8a553de891ef -r 2a32529b310b src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Oct 27 09:41:04 2010 +0200 +++ b/src/common/connection_handlers_events.py Wed Oct 27 10:28:59 2010 +0200 @@ -1119,6 +1119,7 @@ base_network_events = [] def generate(self): - self.jid = self.jingle_session.peerjid + self.fjid = self.jingle_session.peerjid + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.sid = self.jingle_session.sid return True \ No newline at end of file diff -r 8a553de891ef -r 2a32529b310b src/gui_interface.py --- a/src/gui_interface.py Wed Oct 27 09:41:04 2010 +0200 +++ b/src/gui_interface.py Wed Oct 27 10:28:59 2010 +0200 @@ -1513,36 +1513,34 @@ # unknown session type... it should be declined in common/jingle.py return - jid = gajim.get_jid_without_resource(obj.jid) - resource = gajim.get_resource_from_jid(obj.jid) - ctrl = (self.msg_win_mgr.get_control(obj.jid, account) - or self.msg_win_mgr.get_control(jid, account)) + ctrl = (self.msg_win_mgr.get_control(obj.fjid, account) + or self.msg_win_mgr.get_control(obj.jid, account)) if ctrl: if 'audio' in content_types: ctrl.set_audio_state('connection_received', obj.sid) if 'video' in content_types: ctrl.set_video_state('connection_received', obj.sid) - dlg = dialogs.VoIPCallReceivedDialog.get_dialog(obj.jid, obj.sid) + dlg = dialogs.VoIPCallReceivedDialog.get_dialog(obj.fjid, obj.sid) if dlg: dlg.add_contents(content_types) return if helpers.allow_popup_window(account): - dialogs.VoIPCallReceivedDialog(account, obj.jid, obj.sid, + dialogs.VoIPCallReceivedDialog(account, obj.fjid, obj.sid, content_types) return - self.add_event(account, obj.jid, 'jingle-incoming', (obj.jid, obj.sid, + self.add_event(account, obj.jid, 'jingle-incoming', (obj.fjid, obj.sid, content_types)) if helpers.allow_showing_notification(account): # TODO: we should use another pixmap ;-) txt = _('%s wants to start a voice chat.') % \ - gajim.get_name_from_jid(account, obj.jid) + gajim.get_name_from_jid(account, obj.fjid) path = gtkgui_helpers.get_icon_path('gajim-mic_active', 48) event_type = _('Voice Chat Request') - notify.popup(event_type, obj.jid, account, 'jingle-incoming', + notify.popup(event_type, obj.fjid, account, 'jingle-incoming', path_to_image=path, title=event_type, text=txt) def handle_event_jingle_connected(self, account, data):

1 0

gajim: [mulander] improve intl.dll search. Fixes #6006
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset 8a553de891ef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a553de891ef description: [mulander] improve intl.dll search. Fixes #6006 diffstat: src/gajim.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 170e6c2eb167 -r 8a553de891ef src/gajim.py --- a/src/gajim.py Wed Oct 27 09:37:56 2010 +0200 +++ b/src/gajim.py Wed Oct 27 09:41:04 2010 +0200 @@ -51,7 +51,15 @@ locale.setlocale(locale.LC_ALL, '') import ctypes - libintl = ctypes.cdll.LoadLibrary('gtk\\bin\\intl.dll') + import ctypes.util + libintl_path = ctypes.util.find_library('intl') + if libintl_path == None: + local_intl = ok.path.join('gtk', 'bin', 'intl.dll') + if os.path.exists(local_intl): + libintl_path = local_intl + if libintl_path == None: + raise ImportError('intl.dll library not found') + libintl = ctypes.cdll.LoadLibrary(libintl_path) libintl.bindtextdomain(APP, DIR) import warnings

1 0

gajim: create AppData/Gajim folder if it doesn't exists
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset 170e6c2eb167 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=170e6c2eb167 description: create AppData/Gajim folder if it doesn't exists diffstat: src/gajim.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r f06142eeb114 -r 170e6c2eb167 src/gajim.py --- a/src/gajim.py Wed Oct 27 09:36:29 2010 +0200 +++ b/src/gajim.py Wed Oct 27 09:37:56 2010 +0200 @@ -57,7 +57,10 @@ import warnings if os.name == 'nt': - log_file = os.path.join(os.environ['APPDATA'], 'Gajim', 'gajim.log') + log_path = os.path.join(os.environ['APPDATA'], 'Gajim') + if not os.path.exists(log_path): + os.mkdir(log_path, 0700) + log_file = os.path.join(log_path, 'gajim.log') fout = open(log_file, 'a') sys.stdout = fout sys.stderr = fout

1 0

gajim: use NEC to handle jingle incoming events
by Yann Leboulanger 27 Oct '10

27 Oct '10

changeset f06142eeb114 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f06142eeb114 description: use NEC to handle jingle incoming events diffstat: src/common/connection_handlers_events.py | 11 ++++++++- src/common/jingle_session.py | 9 ++++--- src/gui_interface.py | 36 ++++++++++++++++---------------- 3 files changed, 33 insertions(+), 23 deletions(-) diffs (141 lines): diff -r 38cea656417a -r f06142eeb114 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Oct 27 01:16:05 2010 +0200 +++ b/src/common/connection_handlers_events.py Wed Oct 27 09:36:29 2010 +0200 @@ -1112,4 +1112,13 @@ class AnonymousAuthEvent(nec.NetworkIncomingEvent): name = 'anonymous-auth' - base_network_events = [] \ No newline at end of file + base_network_events = [] + +class JingleReceivedEvent(nec.NetworkIncomingEvent): + name = 'jingle-received' + base_network_events = [] + + def generate(self): + self.jid = self.jingle_session.peerjid + self.sid = self.jingle_session.sid + return True \ No newline at end of file diff -r 38cea656417a -r f06142eeb114 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Oct 27 01:16:05 2010 +0200 +++ b/src/common/jingle_session.py Wed Oct 27 09:36:29 2010 +0200 @@ -30,6 +30,7 @@ import xmpp from jingle_transport import get_jingle_transport from jingle_content import get_jingle_content, JingleContentSetupException +from common.connection_handlers_events import JingleReceivedEvent # FIXME: Move it to JingleSession.States? class JingleStates(object): @@ -407,8 +408,8 @@ self.__content_reject(content) self.contents[(content.creator, content.name)].destroy() - self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, - contents)) + gajim.nec.push_incoming_event(JingleReceivedEvent(None, + conn=self.connection, jingle_session=self, contents=contents)) def __on_session_initiate(self, stanza, jingle, error, action): """ @@ -453,8 +454,8 @@ self.state = JingleStates.pending # Send event about starting a session - self.connection.dispatch('JINGLE_INCOMING', (self.peerjid, self.sid, - contents)) + gajim.nec.push_incoming_event(JingleReceivedEvent(None, + conn=self.connection, jingle_session=self, contents=contents)) def __broadcast(self, stanza, jingle, error, action): """ diff -r 38cea656417a -r f06142eeb114 src/gui_interface.py --- a/src/gui_interface.py Wed Oct 27 01:16:05 2010 +0200 +++ b/src/gui_interface.py Wed Oct 27 09:36:29 2010 +0200 @@ -1495,14 +1495,13 @@ 'resource. Please type a new one'), resource=proposed_resource, ok_handler=on_ok) - def handle_event_jingle_incoming(self, account, data): + def handle_event_jingle_incoming(self, obj): # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, # data...)) # TODO: conditional blocking if peer is not in roster - # unpack data - peerjid, sid, contents = data - content_types = set(c[0] for c in contents) + account = obj.conn.name + content_types = set(c[0] for c in obj.contents) # check type of jingle session if 'audio' in content_types or 'video' in content_types: @@ -1514,36 +1513,37 @@ # unknown session type... it should be declined in common/jingle.py return - jid = gajim.get_jid_without_resource(peerjid) - resource = gajim.get_resource_from_jid(peerjid) - ctrl = (self.msg_win_mgr.get_control(peerjid, account) - or self.msg_win_mgr.get_control(jid, account)) + jid = gajim.get_jid_without_resource(obj.jid) + resource = gajim.get_resource_from_jid(obj.jid) + ctrl = (self.msg_win_mgr.get_control(obj.jid, account) + or self.msg_win_mgr.get_control(jid, account)) if ctrl: if 'audio' in content_types: - ctrl.set_audio_state('connection_received', sid) + ctrl.set_audio_state('connection_received', obj.sid) if 'video' in content_types: - ctrl.set_video_state('connection_received', sid) - - dlg = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) + ctrl.set_video_state('connection_received', obj.sid) + + dlg = dialogs.VoIPCallReceivedDialog.get_dialog(obj.jid, obj.sid) if dlg: dlg.add_contents(content_types) return if helpers.allow_popup_window(account): - dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) + dialogs.VoIPCallReceivedDialog(account, obj.jid, obj.sid, + content_types) return - self.add_event(account, peerjid, 'jingle-incoming', (peerjid, sid, + self.add_event(account, obj.jid, 'jingle-incoming', (obj.jid, obj.sid, content_types)) if helpers.allow_showing_notification(account): # TODO: we should use another pixmap ;-) txt = _('%s wants to start a voice chat.') % \ - gajim.get_name_from_jid(account, peerjid) + gajim.get_name_from_jid(account, obj.jid) path = gtkgui_helpers.get_icon_path('gajim-mic_active', 48) event_type = _('Voice Chat Request') - notify.popup(event_type, peerjid, account, 'jingle-incoming', - path_to_image = path, title = event_type, text = txt) + notify.popup(event_type, obj.jid, account, 'jingle-incoming', + path_to_image=path, title=event_type, text=txt) def handle_event_jingle_connected(self, account, data): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) @@ -1894,7 +1894,6 @@ 'INSECURE_SSL_CONNECTION': \ [self.handle_event_insecure_ssl_connection], 'INSECURE_PASSWORD': [self.handle_event_insecure_password], - 'JINGLE_INCOMING': [self.handle_event_jingle_incoming], 'JINGLE_CONNECTED': [self.handle_event_jingle_connected], 'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected], 'JINGLE_ERROR': [self.handle_event_jingle_error], @@ -1908,6 +1907,7 @@ 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth], 'iq-error-received': [self.handle_event_iq_error], + 'jingle-received': [self.handle_event_jingle_incoming], 'last-result-received': [self.handle_event_last_status_time], 'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-owner-received': [self.handle_event_gc_config],

1 0

gajim: rename __sessions to _session
by Yann Leboulanger 26 Oct '10

26 Oct '10

changeset 38cea656417a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38cea656417a description: rename __sessions to _session diffstat: src/common/jingle.py | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diffs (96 lines): diff -r 9cbe77fb9260 -r 38cea656417a src/common/jingle.py --- a/src/common/jingle.py Tue Oct 26 21:25:41 2010 +0200 +++ b/src/common/jingle.py Wed Oct 27 01:16:05 2010 +0200 @@ -44,7 +44,7 @@ def __init__(self): # dictionary: sessionid => JingleSession object - self.__sessions = {} + self._sessions = {} # dictionary: (jid, iq stanza id) => JingleSession object, # one time callbacks @@ -54,12 +54,12 @@ """ Remove a jingle session from a jingle stanza dispatcher """ - if sid in self.__sessions: + if sid in self._sessions: #FIXME: Move this elsewhere? - for content in self.__sessions[sid].contents.values(): + for content in self._sessions[sid].contents.values(): content.destroy() - self.__sessions[sid].callbacks = [] - del self.__sessions[sid] + self._sessions[sid].callbacks = [] + del self._sessions[sid] def _JingleCB(self, con, stanza): """ @@ -85,15 +85,15 @@ sid = jingle.getAttr('sid') # do we need to create a new jingle object - if sid not in self.__sessions: + if sid not in self._sessions: #TODO: tie-breaking and other things... newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid) - self.__sessions[sid] = newjingle + self._sessions[sid] = newjingle # we already have such session in dispatcher... - self.__sessions[sid].on_stanza(stanza) + self._sessions[sid].on_stanza(stanza) # Delete invalid/unneeded sessions - if sid in self.__sessions and self.__sessions[sid].state == JingleStates.ended: + if sid in self._sessions and self._sessions[sid].state == JingleStates.ended: self.delete_jingle_session(sid) raise xmpp.NodeProcessed @@ -106,7 +106,7 @@ jingle.add_content('voice', JingleAudio(jingle)) else: jingle = JingleSession(self, weinitiate=True, jid=jid) - self.__sessions[jingle.sid] = jingle + self._sessions[jingle.sid] = jingle jingle.add_content('voice', JingleAudio(jingle)) jingle.start_session() return jingle.sid @@ -119,7 +119,7 @@ jingle.add_content('video', JingleVideo(jingle)) else: jingle = JingleSession(self, weinitiate=True, jid=jid) - self.__sessions[jingle.sid] = jingle + self._sessions[jingle.sid] = jingle jingle.add_content('video', JingleVideo(jingle)) jingle.start_session() return jingle.sid @@ -127,8 +127,8 @@ def iter_jingle_sessions(self, jid, sid=None, media=None): if sid: - return (session for session in self.__sessions.values() if session.sid == sid) - sessions = (session for session in self.__sessions.values() if session.peerjid == jid) + return (session for session in self._sessions.values() if session.sid == sid) + sessions = (session for session in self._sessions.values() if session.peerjid == jid) if media: if media not in ('audio', 'video'): return tuple() @@ -140,14 +140,14 @@ def get_jingle_session(self, jid, sid=None, media=None): if sid: - if sid in self.__sessions: - return self.__sessions[sid] + if sid in self._sessions: + return self._sessions[sid] else: return None elif media: if media not in ('audio', 'video'): return None - for session in self.__sessions.values(): + for session in self._sessions.values(): if session.peerjid == jid and session.get_content(media): return session

1 0

gajim: use NEC to handle anonymous jid changment
by Yann Leboulanger 26 Oct '10

26 Oct '10

changeset 9cbe77fb9260 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9cbe77fb9260 description: use NEC to handle anonymous jid changment diffstat: src/common/connection.py | 3 ++- src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 9 --------- src/roster_window.py | 9 +++++++++ 4 files changed, 15 insertions(+), 10 deletions(-) diffs (75 lines): diff -r a7e97ff65ad9 -r 9cbe77fb9260 src/common/connection.py --- a/src/common/connection.py Tue Oct 26 17:28:08 2010 +0200 +++ b/src/common/connection.py Tue Oct 26 21:25:41 2010 +0200 @@ -1312,7 +1312,8 @@ old_jid = gajim.get_jid_from_account(self.name) gajim.config.set_per('accounts', self.name, 'name', con.User) new_jid = gajim.get_jid_from_account(self.name) - self.dispatch('NEW_JID', (old_jid, new_jid)) + gajim.nec.push_incoming_event(AnonymousAuthEvent(None, + conn=self, old_jid=old_jid, new_jid=new_jid)) if auth: self.last_io = gajim.idlequeue.current_time() self.connected = 2 diff -r a7e97ff65ad9 -r 9cbe77fb9260 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Oct 26 17:28:08 2010 +0200 +++ b/src/common/connection_handlers_events.py Tue Oct 26 21:25:41 2010 +0200 @@ -1109,3 +1109,7 @@ return return True + +class AnonymousAuthEvent(nec.NetworkIncomingEvent): + name = 'anonymous-auth' + base_network_events = [] \ No newline at end of file diff -r a7e97ff65ad9 -r 9cbe77fb9260 src/gui_interface.py --- a/src/gui_interface.py Tue Oct 26 17:28:08 2010 +0200 +++ b/src/gui_interface.py Tue Oct 26 21:25:41 2010 +0200 @@ -257,14 +257,6 @@ if self.remote_ctrl: self.remote_ctrl.raise_signal('AccountPresence', (show, account)) - def handle_event_new_jid(self, account, data): - #('NEW_JID', account, (old_jid, new_jid)) - """ - This event is raised when our JID changed (most probably because we use - anonymous account. We update contact and roster entry in this case - """ - self.roster.rename_self_contact(data[0], data[1], account) - def edit_own_details(self, account): jid = gajim.get_jid_from_account(account) if 'profile' not in self.instances[account]: @@ -1851,7 +1843,6 @@ 'DB_ERROR': [self.handle_event_db_error], 'INFORMATION': [self.handle_event_information], 'STATUS': [self.handle_event_status], - 'NEW_JID': [self.handle_event_new_jid], 'MSGERROR': [self.handle_event_msgerror], 'MSGSENT': [self.handle_event_msgsent], 'MSGNOTSENT': [self.handle_event_msgnotsent], diff -r a7e97ff65ad9 -r 9cbe77fb9260 src/roster_window.py --- a/src/roster_window.py Tue Oct 26 17:28:08 2010 +0200 +++ b/src/roster_window.py Tue Oct 26 21:25:41 2010 +0200 @@ -2477,6 +2477,13 @@ self.add_account_contacts(obj.conn.name) self.fire_up_unread_messages_events(obj.conn.name) + def _nec_anonymous_auth(self, obj): + """ + This event is raised when our JID changed (most probably because we use + anonymous account. We update contact and roster entry in this case + """ + self.rename_self_contact(obj.old_jid, obj.new_jid, obj.conn.name) + ################################################################################ ### Menu and GUI callbacks ### FIXME: order callbacks in itself... @@ -6208,3 +6215,5 @@ self._nec_presence_received) gajim.ged.register_event_handler('roster-received', ged.GUI1, self._nec_roster_received) + gajim.ged.register_event_handler('anonymous-auth', ged.GUI1, + self._nec_anonymous_auth) \ No newline at end of file

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2010