Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9969 - trunk/src
by bct＠gajim.org 20 Jul '08

20 Jul '08

Author: bct Date: 2008-07-20 17:06:15 +0200 (Sun, 20 Jul 2008) New Revision: 9969 Modified: trunk/src/gajim.py Log: wrong method name when restarting e2e Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-20 14:53:34 UTC (rev 9968) +++ trunk/src/gajim.py 2008-07-20 15:06:15 UTC (rev 9969) @@ -1737,7 +1737,7 @@ session.conn.delete_session(jid, session.thread_id) # restart the session - session.begin_e2e_negotiation() + session.negotiate_e2e() def handle_event_privacy_lists_received(self, account, data): # ('PRIVACY_LISTS_RECEIVED', account, list)

1 0

[commit-gajim] r9968 - trunk/src
by js＠gajim.org 20 Jul '08

20 Jul '08

Author: js Date: 2008-07-20 16:53:34 +0200 (Sun, 20 Jul 2008) New Revision: 9968 Modified: trunk/src/gajim.py Log: It's bad to silently drop errors when not running it from the SVN repo. On Windows, it's even worse: When something throws a TB, the user won't notice before Gajim is terminated (a dialog will show then that gajim.exe.log was created, nothing more!) Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-20 14:48:08 UTC (rev 9967) +++ trunk/src/gajim.py 2008-07-20 14:53:34 UTC (rev 9968) @@ -213,13 +213,7 @@ del pritext -path = os.getcwd() -if '.svn' in os.listdir(path) or '_svn' in os.listdir(path): - # import gtkexcepthook only for those that run svn - # those than run with --verbose run from terminal so no need to care - # about those - import gtkexcepthook -del path +import gtkexcepthook import gobject if not hasattr(gobject, 'timeout_add_seconds'):

1 0

[commit-gajim] r9967 - trunk/src/common
by js＠gajim.org 20 Jul '08

20 Jul '08

Author: js Date: 2008-07-20 16:48:08 +0200 (Sun, 20 Jul 2008) New Revision: 9967 Modified: trunk/src/common/defs.py Log: This does a better job :). Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-07-20 14:44:08 UTC (rev 9966) +++ trunk/src/common/defs.py 2008-07-20 14:48:08 UTC (rev 9967) @@ -1,9 +1,11 @@ +import re + docdir = '../' - datadir = '../' version = '0.11.4.4-svn' -rev = '$Rev$'.replace('$', '').replace('Rev', '').replace(': ', '') + +rev = re.sub('[^0-9]', '', '$Rev$') if rev is not '': version += ' r' + rev

1 0

[commit-gajim] r9966 - trunk/src/common
by js＠gajim.org 20 Jul '08

20 Jul '08

Author: js Date: 2008-07-20 16:44:08 +0200 (Sun, 20 Jul 2008) New Revision: 9966 Modified: trunk/src/common/defs.py Log: This should automatically include the revision in our version. Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-07-20 13:48:50 UTC (rev 9965) +++ trunk/src/common/defs.py 2008-07-20 14:44:08 UTC (rev 9966) @@ -3,6 +3,9 @@ datadir = '../' version = '0.11.4.4-svn' +rev = '$Rev$'.replace('$', '').replace('Rev', '').replace(': ', '') +if rev is not '': + version += ' r' + rev import sys, os.path for base in ('.', 'common'): Property changes on: trunk/src/common/defs.py ___________________________________________________________________ Name: svn:keywords + Rev

1 0

[commit-gajim] r9965 - trunk/src
by js＠gajim.org 20 Jul '08

20 Jul '08

Author: js Date: 2008-07-20 15:48:50 +0200 (Sun, 20 Jul 2008) New Revision: 9965 Modified: trunk/src/gajim.py Log: Fix #4113. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-19 20:42:03 UTC (rev 9964) +++ trunk/src/gajim.py 2008-07-20 13:48:50 UTC (rev 9965) @@ -269,7 +269,7 @@ def pid_alive(): try: pf = open(pid_filename) - except: + except IOError: # probably file not found return False

1 0

[commit-gajim] r9964 - in trunk/src: . common
by bct＠gajim.org 19 Jul '08

19 Jul '08

Author: bct Date: 2008-07-19 22:42:03 +0200 (Sat, 19 Jul 2008) New Revision: 9964 Modified: trunk/src/chat_control.py trunk/src/common/config.py trunk/src/common/stanza_session.py Log: added option for esession autonegotiation added option for modp groups to use in a negotiation Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-19 20:41:53 UTC (rev 9963) +++ trunk/src/chat_control.py 2008-07-19 20:42:03 UTC (rev 9964) @@ -1155,9 +1155,10 @@ self.session and self.session.is_loggable(), True) # then try E2E # XXX: Once we have fallback to disco, remove notexistant check - elif not e2e_is_active and \ - gajim.capscache.is_supported(contact, NS_ESESSION) and \ - not gajim.capscache.is_supported(contact, 'notexistant'): + elif not e2e_is_active and gajim.HAVE_PYCRYPTO \ + and gajim.config.get('autonegotiate_esessions') \ + and gajim.capscache.is_supported(contact, NS_ESESSION) \ + and not gajim.capscache.is_supported(contact, 'notexistant'): self.begin_e2e_negotiation() self.status_tooltip = gtk.Tooltips() Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-19 20:41:53 UTC (rev 9963) +++ trunk/src/common/config.py 2008-07-19 20:42:03 UTC (rev 9964) @@ -191,7 +191,8 @@ 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], - 'e2e_public_key': [opt_bool, False, _('When negotiating an encrypted session, should Gajim prefer to use public keys for identification?')], + 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], + 'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')], 'chat_avatar_width': [opt_int, 52], 'chat_avatar_height': [opt_int, 52], 'roster_avatar_width': [opt_int, 32], Modified: trunk/src/common/stanza_session.py =================================================================== --- trunk/src/common/stanza_session.py 2008-07-19 20:41:53 UTC (rev 9963) +++ trunk/src/common/stanza_session.py 2008-07-19 20:42:03 UTC (rev 9964) @@ -483,7 +483,7 @@ x.addChild(node=xmpp.DataField(name='my_nonce', value=base64.b64encode(self.n_s), typ='hidden')) - modp_options = [ 5, 14, 2, 1 ] + modp_options = [ int(g) for g in gajim.config.get('esession_modp').split(',') ] x.addChild(node=xmpp.DataField(name='modp', typ='list-single', options=map(lambda x: [ None, x ], modp_options)))

1 0

[commit-gajim] r9963 - trunk/src
by bct＠gajim.org 19 Jul '08

19 Jul '08

Author: bct Date: 2008-07-19 22:41:53 +0200 (Sat, 19 Jul 2008) New Revision: 9963 Modified: trunk/src/chat_control.py Log: fix a really silly bug caused by my last commit Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-19 19:55:13 UTC (rev 9962) +++ trunk/src/chat_control.py 2008-07-19 20:41:53 UTC (rev 9963) @@ -2390,6 +2390,6 @@ 'status') if status: - ctrl.print_conversation(' (', 'status', simple=True) - ctrl.print_conversation('%s' % (status), 'status', simple=True) - ctrl.print_conversation(')', 'status', simple=True) + self.print_conversation(' (', 'status', simple=True) + self.print_conversation('%s' % (status), 'status', simple=True) + self.print_conversation(')', 'status', simple=True)

1 0

[commit-gajim] r9962 - trunk/src
by steve-e＠gajim.org 19 Jul '08

19 Jul '08

Author: steve-e Date: 2008-07-19 21:55:13 +0200 (Sat, 19 Jul 2008) New Revision: 9962 Modified: trunk/src/music_track_listener.py Log: Add use_tune support for banshee 1.0. (No more polling, yeah!) Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2008-07-19 18:31:45 UTC (rev 9961) +++ trunk/src/music_track_listener.py 2008-07-19 19:55:13 UTC (rev 9962) @@ -33,7 +33,6 @@ __slots__ = ['title', 'album', 'artist', 'duration', 'track_number', 'paused'] - class MusicTrackListener(gobject.GObject): __gsignals__ = { 'music-track-changed': (gobject.SIGNAL_RUN_LAST, None, (object,)), @@ -57,7 +56,8 @@ 'org.freedesktop.MediaPlayer') bus.add_signal_receiver(self._mpris_playing_changed_cb, 'StatusChange', 'org.freedesktop.MediaPlayer') - + bus.add_signal_receiver(self._player_name_owner_changed, + 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.freedesktop.MediaPlayer') ## Muine bus.add_signal_receiver(self._muine_music_track_change_cb, 'SongChanged', @@ -76,42 +76,11 @@ 'playingSongPropertyChanged', 'org.gnome.Rhythmbox.Player') ## Banshee - # Banshee sucks because it only supports polling. - # Thus, we only register this is we are very sure that it's - # installed. - if os.name == 'posix' and os.system('which banshee >/dev/null 2>&1') == 0: - banshee_bus = dbus.SessionBus() - dubus = banshee_bus.get_object('org.freedesktop.DBus', - '/org/freedesktop/dbus') - self.dubus_methods = dbus.Interface(dubus, 'org.freedesktop.DBus') - self.current_banshee_title = '' - self.banshee_paused_before = False - self.banshee_is_here = False - gobject.timeout_add_seconds(10, self._check_if_banshee_bus) - if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): - self._get_banshee_bus() - self.banshee_is_here = True - # Otherwise, it opens Banshee! - self.banshee_props ={} - gobject.timeout_add_seconds(1, self._banshee_check_track_status) + bus.add_signal_receiver(self._banshee_state_changed_cb, + 'StateChanged', 'org.bansheeproject.Banshee.PlayerEngine') + bus.add_signal_receiver(self._player_name_owner_changed, + 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='org.bansheeproject.Banshee') - def _check_if_banshee_bus(self): - if self.dubus_methods.NameHasOwner('org.gnome.Banshee'): - self._get_banshee_bus() - self.banshee_is_here = True - else: - self.banshee_is_here = False - return True - - def _get_banshee_bus(self): - bus = dbus.SessionBus() - banshee = bus.get_object('org.gnome.Banshee', '/org/gnome/Banshee/Player') - self.banshee_methods = dbus.Interface(banshee, 'org.gnome.Banshee.Core') - - def do_music_track_changed(self, info): - if info is not None: - self._last_playing_music = info - def _player_name_owner_changed(self, name, old, new): if not new: self.emit('music-track-changed', None) @@ -192,54 +161,22 @@ info.track_number = int(props['track-number']) return info - def _banshee_check_track_status(self): - if self.dubus_methods.NameHasOwner('org.gnome.Banshee') and \ - not hasattr(self, 'banshee_methods'): - self._get_banshee_bus() + def _banshee_state_changed_cb(self, state): + if state == 'playing': + bus = dbus.SessionBus() + banshee = bus.get_object("org.bansheeproject.Banshee", "/org/bansheeproject/Banshee/PlayerEngine") + currentTrack = banshee.GetCurrentTrack() + self._last_playing_music = self._banshee_properties_extract(currentTrack) + self.emit('music-track-changed', self._last_playing_music) + elif state == 'paused': + self.emit('music-track-changed', None) - if self.dubus_methods.NameHasOwner('org.gnome.Banshee') and self.banshee_is_here: - try: - self.banshee_props['title'] = self.banshee_methods.GetPlayingTitle() - self.banshee_props['album'] = self.banshee_methods.GetPlayingAlbum() - self.banshee_props['artist'] = self.banshee_methods.\ - GetPlayingArtist() - self.banshee_props['duration'] = \ - self.banshee_methods.GetPlayingDuration() - self.banshee_props['paused'] = self.banshee_methods.\ - GetPlayingStatus() - info = self._banshee_properties_extract(self.banshee_props) - except dbus.DBusException, err: - info = None - - for key in self.banshee_props.keys(): - self.banshee_props[key] = '' - self.banshee_is_here = False - - if self.current_banshee_title != self.banshee_props['title']: - self.emit('music-track-changed', info) - self.banshee_paused_before = False - if self.banshee_props['paused'] == 0 and self.banshee_paused_before ==\ - False: - self.emit('music-track-changed', info) - self.banshee_paused_before = True - else: - if self.banshee_paused_before and self.banshee_props['paused'] == 1: - self.emit('music-track-changed', info) - self.banshee_paused_before = False - self.current_banshee_title = self.banshee_props['title'] - return 1 - - def _banshee_music_track_change_cb(self, arg): - info = self._banshee_properties_extract(arg) - self.emit('music-track-changed', info) - def _banshee_properties_extract(self, props): info = MusicTrackInfo() - info.title = props['title'] + info.title = props['name'] info.album = props['album'] info.artist = props['artist'] - info.duration = int(props['duration']) - info.paused = props['paused'] + info.duration = int(props['length']) return info def get_playing_track(self):

1 0

[commit-gajim] r9961 - trunk/src
by bct＠gajim.org 19 Jul '08

19 Jul '08

Author: bct Date: 2008-07-19 20:31:45 +0200 (Sat, 19 Jul 2008) New Revision: 9961 Modified: trunk/src/chat_control.py trunk/src/roster_window.py Log: update status in resource-specific chat windows Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-19 17:36:21 UTC (rev 9960) +++ trunk/src/chat_control.py 2008-07-19 18:31:45 UTC (rev 9961) @@ -2380,3 +2380,16 @@ if contact: self.contact = contact self.draw_banner() + + def update_status_display(self, name, uf_show, status): + '''print the contact's status and update the status/GPG image''' + self.update_ui() + self.parent_win.redraw_tab(self) + + self.print_conversation(_('%s is now %s') % (name, uf_show), + 'status') + + if status: + ctrl.print_conversation(' (', 'status', simple=True) + ctrl.print_conversation('%s' % (status), 'status', simple=True) + ctrl.print_conversation(')', 'status', simple=True) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-19 17:36:21 UTC (rev 9960) +++ trunk/src/roster_window.py 2008-07-19 18:31:45 UTC (rev 9961) @@ -1803,7 +1803,7 @@ contact.status = status # name is to show in conversation window name = contact.get_shown_name() - + # The contact has several resources if len(contact_instances) > 1: if contact.resource != '': @@ -1828,25 +1828,22 @@ # SelfContact went offline. Remove him when last pending message was read self.remove_contact(contact.jid, account, backend=True) + uf_show = helpers.get_uf_show(show) + # print status in chat window and update status/GPG image - if gajim.interface.msg_win_mgr.has_window(contact.jid, account): - win = gajim.interface.msg_win_mgr.get_window(contact.jid, account) - uf_show = helpers.get_uf_show(show) + ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account) + if ctrl: + ctrl.contact = gajim.contacts.get_contact_with_highest_priority( + account, contact.jid) + ctrl.update_status_display(name, uf_show, status) - ctrl = win.get_control(contact.jid, account) + if contact.resource != '': + fjid = contact.jid + '/' + contact.resource + + ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account) if ctrl: - ctrl.contact = gajim.contacts.get_contact_with_highest_priority( - account, contact.jid) - ctrl.update_ui() - win.redraw_tab(ctrl) + ctrl.update_status_display(name, uf_show, status) - ctrl.print_conversation(_('%s is now %s') % (name, uf_show), - 'status') - if status: - ctrl.print_conversation(' (', 'status', simple=True) - ctrl.print_conversation('%s' % (status), 'status', simple=True) - ctrl.print_conversation(')', 'status', simple=True) - # unset custom status if gajim.interface.status_sent_to_users.has_key(account) and \ contact.jid in gajim.interface.status_sent_to_users[account]:

1 0

[commit-gajim] r9960 - in trunk: data/glade src
by steve-e＠gajim.org 19 Jul '08

19 Jul '08

Author: steve-e Date: 2008-07-19 19:36:21 +0200 (Sat, 19 Jul 2008) New Revision: 9960 Removed: trunk/data/glade/invitation_received_dialog.glade Modified: trunk/src/dialogs.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: Improved groupchat minimization: * partly rewrote join_room because it was hard to read * Correctly handle invites from anonymous rooms. Fixes #4057 * Use HIG dialog for invitation requests * Fix bug where minimized groupchats where hidden after a reconnect * Removed some duplicated code Deleted: trunk/data/glade/invitation_received_dialog.glade =================================================================== --- trunk/data/glade/invitation_received_dialog.glade 2008-07-19 14:45:04 UTC (rev 9959) +++ trunk/data/glade/invitation_received_dialog.glade 2008-07-19 17:36:21 UTC (rev 9960) @@ -1,221 +0,0 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkDialog" id="invitation_received_dialog"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Invitation Received</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</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_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="has_separator">True</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox11"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area10"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="deny_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-9</property> - - <child> - <widget class="GtkAlignment" id="alignment95"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2995"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1238"> - <property name="visible">True</property> - <property name="stock">gtk-cancel</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label362"> - <property name="visible">True</property> - <property name="label" translatable="yes">Deny</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="accept_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="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-8</property> - - <child> - <widget class="GtkAlignment" id="alignment94"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox2994"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1237"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label361"> - <property name="visible">True</property> - <property name="label" translatable="yes">Accept</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-19 14:45:04 UTC (rev 9959) +++ trunk/src/dialogs.py 2008-07-19 17:36:21 UTC (rev 9960) @@ -2214,8 +2214,8 @@ self.instances.remove(self) def set_cursor_to_end(self): - end_iter = self.message_tv_buffer.get_end_iter() - self.message_tv_buffer.place_cursor(end_iter) + end_iter = self.message_tv_buffer.get_end_iter() + self.message_tv_buffer.place_cursor(end_iter) def save_pos(self): # save the window size and position @@ -2920,51 +2920,35 @@ self.account = account self.password = password self.is_continued = is_continued - xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade') - self.dialog = xml.get_widget('invitation_received_dialog') + pritext = _('''You are invited to a groupchat''') #Don't translate $Contact if is_continued: - pritext = _('$Contact has invited you to join a discussion') + sectext = _('$Contact has invited you to join a discussion') else: - pritext = _('$Contact has invited you to group chat %(room_jid)s')\ + sectext = _('$Contact has invited you to group chat %(room_jid)s')\ % {'room_jid': room_jid} contact = gajim.contacts.get_first_contact_from_jid(account, contact_jid) - if contact and contact.name: - contact_text = '%s (%s)' % (contact.name, contact_jid) - else: - contact_text = contact_jid - pritext = pritext.replace('$Contact', contact_text) + contact_text = contact and contact.name or contact_jid + sectext = sectext.replace('$Contact', contact_text) - label_text = '<big><b>%s</b></big>' % pritext - if comment: # only if not None and not '' comment = gobject.markup_escape_text(comment) - sectext = _('Comment: %s') % comment - label_text += '\n\n%s' % sectext + comment = _('Comment: %s') % comment + sectext += '\n\n%s' % comment + sectext += '\n\n' + _('Do you want to accept the invitation?') + + dialog = YesNoDialog(pritext, sectext) + if dialog.get_response() == gtk.RESPONSE_YES: + try: + if self.is_continued: + gajim.interface.join_gc_room(self.account, self.room_jid, + gajim.nicks[self.account], None, is_continued=True) + else: + JoinGroupchatWindow(self.account, self.room_jid) + except GajimGeneralException: + pass - xml.get_widget('label').set_markup(label_text) - - xml.get_widget('deny_button').connect('clicked', - self.on_deny_button_clicked) - xml.get_widget('accept_button').connect('clicked', - self.on_accept_button_clicked) - self.dialog.show_all() - - def on_deny_button_clicked(self, widget): - self.dialog.destroy() - - def on_accept_button_clicked(self, widget): - self.dialog.destroy() - try: - if self.is_continued: - gajim.interface.join_gc_room(self.account, self.room_jid, - gajim.nicks[self.account], None, is_continued=True) - else: - JoinGroupchatWindow(self.account, self.room_jid) - except GajimGeneralException: - pass - class ProgressDialog: def __init__(self, title_text, during_text, messages_queue): '''during text is what to show during the procedure, Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-19 14:45:04 UTC (rev 9959) +++ trunk/src/gajim.py 2008-07-19 17:36:21 UTC (rev 9960) @@ -2128,11 +2128,7 @@ if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) - if self.minimized_controls[account].has_key(jid): - if not w: - ctrl = self.minimized_controls[account][jid] - w = self.msg_win_mgr.create_window(ctrl.contact, \ - ctrl.account, ctrl.type_id) + if jid in self.minimized_controls[account]: self.roster.on_groupchat_maximized(None, jid, account) if not ctrl: @@ -2473,48 +2469,51 @@ ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): '''joins the room immediately''' if not nick: nick = gajim.nicks[account] + if self.msg_win_mgr.has_window(room_jid, account) and \ - gajim.gc_connected[account][room_jid]: + gajim.gc_connected[account][room_jid]: gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) win = gc_ctrl.parent_win win.set_active_tab(gc_ctrl) dialogs.ErrorDialog(_('You are already in group chat %s') % room_jid) return - minimized_control_exists = False - if room_jid in gajim.interface.minimized_controls[account]: - minimized_control_exists = True + invisible_show = gajim.SHOW_LIST.index('invisible') if gajim.connections[account].connected == invisible_show: dialogs.ErrorDialog( _('You cannot join a group chat while you are invisible')) return - if minimize and not minimized_control_exists and \ + + minimized_control_exists = False + if room_jid in gajim.interface.minimized_controls[account]: + minimized_control_exists = True + + if not minimized_control_exists and \ not self.msg_win_mgr.has_window(room_jid, account): - contact = gajim.contacts.create_contact(jid=room_jid, name=nick) - gc_control = GroupchatControl(None, contact, account) - self.minimized_controls[account][room_jid] = gc_control - gajim.connections[account].join_gc(nick, room_jid, password) - if password: - gajim.gc_passwords[room_jid] = password + # Join new groupchat + if minimize: + contact = gajim.contacts.create_contact(jid=room_jid, name=nick) + gc_control = GroupchatControl(None, contact, account) + gajim.interface.minimized_controls[account][room_jid] = gc_control + self.roster.add_groupchat(room_jid, account) + else: + self.new_room(room_jid, nick, account, is_continued=is_continued) + elif not minimized_control_exists: + # We are already in that groupchat + gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) + gc_control.parent_win.set_active_tab(gc_control) + else: + # We are already in this groupchat and it is minimized self.roster.add_groupchat(room_jid, account) - return - if not minimized_control_exists and \ - not self.msg_win_mgr.has_window(room_jid, account): - self.new_room(room_jid, nick, account, is_continued=is_continued) - if not minimized_control_exists: - gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) - gc_control.parent_win.set_active_tab(gc_control) + + # Connect gajim.connections[account].join_gc(nick, room_jid, password) if password: gajim.gc_passwords[room_jid] = password - contact = gajim.contacts.get_contact_with_highest_priority(account, \ - room_jid) - if contact or minimized_control_exists: - self.roster.add_groupchat(room_jid, account) def new_room(self, room_jid, nick, account, is_continued=False): # Get target window, create a control, and associate it with the window @@ -2821,11 +2820,16 @@ jid = bm['jid'] # Only join non-opened groupchats. Opened one are already # auto-joined on re-connection - if not gajim.gc_connected[account].has_key(jid): + if not jid in gajim.gc_connected[account]: # we are not already connected minimize = bm['minimize'] in ('1', 'true') gajim.interface.join_gc_room(account, jid, bm['nick'], bm['password'], minimize = minimize) + elif jid in self.minimized_controls[account]: + # more or less a hack: + # On disconnect the minimized gc contact instances + # were set to offline. Reconnect them to show up in the roster. + self.roster.add_groupchat(jid, account) def add_gc_bookmark(self, account, name, jid, autojoin, minimize, password, nick): Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-07-19 14:45:04 UTC (rev 9959) +++ trunk/src/groupchat_control.py 2008-07-19 17:36:21 UTC (rev 9960) @@ -1624,14 +1624,11 @@ control.unparent() ctrl.parent_win = None - gajim.interface.minimized_controls[self.account][self.contact.jid] = \ - ctrl - - del win._controls[self.account][self.contact.jid] - gajim.interface.roster.add_groupchat(self.contact.jid, self.account, status = self.subject) + del win._controls[self.account][self.contact.jid] + def shutdown(self, status='offline'): # destroy banner tooltip - bug #pygtk for that! self.subject_tooltip.destroy() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-19 14:45:04 UTC (rev 9959) +++ trunk/src/roster_window.py 2008-07-19 17:36:21 UTC (rev 9960) @@ -705,7 +705,6 @@ else: self._remove_entity(contact, account) - if backend: # Remove contact before redrawing, otherwise the old # numbers will still be show @@ -730,20 +729,28 @@ Return the added contact instance. ''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) + # Do not show gc if we are disconnected and minimize it + if gajim.account_is_connected(account): + show = 'online' + else: + show = 'offline' + status = '' + if contact is None: - # Do not show gc if we are disconnected and minimize it - if gajim.account_is_connected(account): - show = 'online' - else: - show = 'offline' - status = '' + # New groupchat contact = gajim.contacts.create_contact(jid=jid, name=jid, groups=[_('Groupchats')], show=show, status=status, sub='none') gajim.contacts.add_contact(account, contact) + gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account) + if gc_control: + # there is a window that we can minimize + gajim.interface.minimized_controls[account][jid] = gc_control self.add_contact(jid, account) else: - contact.show = 'online' + contact.show = show + contact.status = status self.draw_completely_and_show_if_needed(jid, account) + return contact @@ -751,6 +758,8 @@ '''Remove groupchat from roster and redraw account and group.''' contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if contact.is_groupchat(): + if jid in gajim.interface.minimized_controls[account]: + gajim.interface.minimized_controls[account][jid] self.remove_contact(jid, account, force=True, backend=True) return True else: @@ -961,7 +970,8 @@ name = gobject.markup_escape_text(contact.get_shown_name()) # gets number of unread gc marked messages - if jid in gajim.interface.minimized_controls[account]: + if jid in gajim.interface.minimized_controls[account] and \ + gajim.interface.minimized_controls[account][jid]: nb_unread = len(gajim.events.get_events(account, jid, ['printed_marked_gc_msg'])) nb_unread += \ @@ -1581,18 +1591,6 @@ return True return False - def auto_join_bookmarks(self, account): - '''autojoin bookmarks that have 'auto join' on for this account''' - for bm in gajim.connections[account].bookmarks: - if bm['autojoin'] in ('1', 'true'): - jid = bm['jid'] - if not gajim.gc_connected[account].has_key(jid) or\ - not gajim.gc_connected[account][jid]: - # we are not already connected - minimize = bm['minimize'] in ('1', 'true') - gajim.interface.join_gc_room(account, jid, bm['nick'], - bm['password'], minimize = minimize) - def on_event_removed(self, event_list): '''Remove contacts on last events removed. @@ -2651,9 +2649,9 @@ def on_disconnect(self, widget, jid, account): '''When disconnect menuitem is activated: disconect from room''' - ctrl = gajim.interface.minimized_controls[account][jid] - del gajim.interface.minimized_controls[account][jid] - ctrl.shutdown() + if jid in gajim.interface.minimized_controls[account]: + ctrl = gajim.interface.minimized_controls[account][jid] + ctrl.shutdown() self.remove_groupchat(jid, account) def on_send_single_message_menuitem_activate(self, widget, account, @@ -2722,6 +2720,8 @@ def on_groupchat_maximized(self, widget, jid, account): '''When a groupchat is maximised''' + if not jid in gajim.interface.minimized_controls[account]: + return ctrl = gajim.interface.minimized_controls[account][jid] mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, ctrl.account) @@ -2731,8 +2731,7 @@ ctrl.parent_win = mw mw.new_tab(ctrl) mw.set_active_tab(ctrl) - del gajim.interface.minimized_controls[account][jid] - + self.remove_groupchat(jid, account) def on_edit_account(self, widget, account): @@ -3240,15 +3239,21 @@ type_ = model[path][C_TYPE] jid = model[path][C_JID].decode('utf-8') resource = None - contact = None + contact = gajim.contacts.get_first_contact_from_jid(account, jid) titer = model.get_iter(path) if type_ in ('group', 'account'): if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.tree.expand_row(path, False) - elif jid in gajim.interface.minimized_controls[account]: - self.on_groupchat_maximized(None, jid, account) + elif contact.is_groupchat(): + first_ev = gajim.events.get_first_event(account, jid) + if first_ev and self.open_event(account, jid, first_ev): + # We are invited to a GC + # open event cares about connecting to it + self.remove_groupchat(jid, account) + else: + self.on_groupchat_maximized(None, jid, account) else: first_ev = gajim.events.get_first_event(account, jid) if not first_ev:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2008