Commits April 2011

commits@gajim.org

3 participants
31 discussions

gajim: fix dcraven images so top and bottom offset is the same o...
by Yann Leboulanger 29 Apr '11

29 Apr '11

changeset 3fc441178f53 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3fc441178f53 description: fix dcraven images so top and bottom offset is the same on all images. Fixes #6870 diffstat: data/iconsets/dcraven/32x32/chat.png | 0 data/iconsets/dcraven/32x32/dnd.png | 0 data/iconsets/dcraven/32x32/error.png | 0 data/iconsets/dcraven/32x32/not_in_roster.png | 0 data/iconsets/dcraven/32x32/offline.png | 0 data/iconsets/dcraven/32x32/online.png | 0 6 files changed, 0 insertions(+), 0 deletions(-) diffs (12 lines): diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/chat.png Binary file data/iconsets/dcraven/32x32/chat.png has changed diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/dnd.png Binary file data/iconsets/dcraven/32x32/dnd.png has changed diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/error.png Binary file data/iconsets/dcraven/32x32/error.png has changed diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/not_in_roster.png Binary file data/iconsets/dcraven/32x32/not_in_roster.png has changed diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/offline.png Binary file data/iconsets/dcraven/32x32/offline.png has changed diff -r e821efda06c2 -r 3fc441178f53 data/iconsets/dcraven/32x32/online.png Binary file data/iconsets/dcraven/32x32/online.png has changed

1 0

gajim: fix dcraven images so top and bottom offset is the same o...
by Yann Leboulanger 29 Apr '11

29 Apr '11

changeset 2f323425ec8d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2f323425ec8d description: fix dcraven images so top and bottom offset is the same on all images. Fixes #6870 diffstat: data/iconsets/dcraven/32x32/chat.png | 0 data/iconsets/dcraven/32x32/dnd.png | 0 data/iconsets/dcraven/32x32/error.png | 0 data/iconsets/dcraven/32x32/not_in_roster.png | 0 data/iconsets/dcraven/32x32/offline.png | 0 data/iconsets/dcraven/32x32/online.png | 0 plugins/snarl_notifications/plugin.py | 25 +--- src/chat_control.py | 2 +- src/common/connection_handlers.py | 1 + src/common/connection_handlers_events.py | 154 ++++++++++++++++++++++++ src/common/gajim.py | 3 + src/common/ged.py | 17 +- src/common/nec.py | 8 +- src/disco.py | 1 - src/groupchat_control.py | 23 +++- src/notify.py | 27 ++++ src/roster_window.py | 40 ++++++ src/session.py | 162 +++++++++++++++---------- 18 files changed, 362 insertions(+), 101 deletions(-) diffs (truncated from 689 to 300 lines): diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/chat.png Binary file data/iconsets/dcraven/32x32/chat.png has changed diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/dnd.png Binary file data/iconsets/dcraven/32x32/dnd.png has changed diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/error.png Binary file data/iconsets/dcraven/32x32/error.png has changed diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/not_in_roster.png Binary file data/iconsets/dcraven/32x32/not_in_roster.png has changed diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/offline.png Binary file data/iconsets/dcraven/32x32/offline.png has changed diff -r e821efda06c2 -r 2f323425ec8d data/iconsets/dcraven/32x32/online.png Binary file data/iconsets/dcraven/32x32/online.png has changed diff -r e821efda06c2 -r 2f323425ec8d plugins/snarl_notifications/plugin.py --- a/plugins/snarl_notifications/plugin.py Wed Apr 27 17:19:42 2011 +0200 +++ b/plugins/snarl_notifications/plugin.py Fri Apr 29 21:29:50 2011 +0200 @@ -45,7 +45,7 @@ #self.gui_extension_points = {} #self.config_default_values = {} - self.events_handlers = {'NewMessage' : (ged.POSTCORE, self.newMessage)} + self.events_handlers = {'notification' : (ged.POSTCORE, self.notif)} @log_calls('SnarlNotificationsPlugin') def activate(self): @@ -56,29 +56,12 @@ pass @log_calls('SnarlNotificationsPlugin') - def newMessage(self, args): - event_name = "NewMessage" - data = args - account = data[0] - jid = data[1][0] - jid_without_resource = gajim.get_jid_without_resource(jid) - msg = data[1][1] - msg_type = data[1][4] - if msg_type == 'chat': - nickname = gajim.get_contact_name_from_jid(account, jid_without_resource) - elif msg_type in ('pm', 'groupchat'): - nickname = gajim.get_resource_from_jid(jid) - else: - nickname = jid - - print "Event '%s' occured. Arguments: %s\n\n===\n"%(event_name, pformat(args)) - print "Event '%s' occured. Arguments: \naccount = %s\njid = %s\nmsg = %s\nnickname = %s"%( - event_name, account, jid, msg, nickname) - + def notif(self, obj): + print "Event '%s' occured.\n\n===\n" % obj.popup_event_type #if PySnarl.snGetVersion() != False: #(major, minor) = PySnarl.snGetVersion() #print "Found Snarl version",str(major)+"."+str(minor),"running." - #PySnarl.snShowMessage(nickname, msg[:20]+'...') + #PySnarl.snShowMessage(obj.popup_title, obj.popup_text) #else: #print "Sorry Snarl does not appear to be running" diff -r e821efda06c2 -r 2f323425ec8d src/chat_control.py --- a/src/chat_control.py Wed Apr 27 17:19:42 2011 +0200 +++ b/src/chat_control.py Fri Apr 29 21:29:50 2011 +0200 @@ -2954,7 +2954,7 @@ if len(data) > 6 and isinstance(data[6], int): message_ids.append(data[6]) - if len(data) > 8: + if len(data) > 8 and not self.session: self.set_session(data[8]) if message_ids: gajim.logger.set_read_messages(message_ids) diff -r e821efda06c2 -r 2f323425ec8d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Apr 27 17:19:42 2011 +0200 +++ b/src/common/connection_handlers.py Fri Apr 29 21:29:50 2011 +0200 @@ -1240,6 +1240,7 @@ gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( ArchivingPreferencesChangedReceivedEvent) + gajim.nec.register_incoming_event(NotificationEvent) gajim.ged.register_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received) diff -r e821efda06c2 -r 2f323425ec8d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Apr 27 17:19:42 2011 +0200 +++ b/src/common/connection_handlers_events.py Fri Apr 29 21:29:50 2011 +0200 @@ -35,6 +35,8 @@ from common.logger import LOG_DB_PATH from common.pep import SUPPORTED_PERSONAL_USER_EVENTS +import gtkgui_helpers + import logging log = logging.getLogger('gajim.c.connection_handlers_events') @@ -1888,3 +1890,155 @@ self.prompt = None self.prompt_jid = None return True + +class NotificationEvent(nec.NetworkIncomingEvent): + name = 'notification' + base_network_events = ['decrypted-message-received', 'gc-message-received'] + + def detect_type(self): + if self.base_event.name == 'decrypted-message-received': + self.notif_type = 'msg' + if self.base_event.name == 'gc-message-received': + self.notif_type = 'gc-msg' + + def get_focused(self): + self.control_focused = False + if self.control: + parent_win = self.control.parent_win + if parent_win and self.control == parent_win.get_active_control() \ + and parent_win.window.has_focus: + self.control_focused = True + + def handle_incoming_msg_event(self, msg_obj): + if not msg_obj.msgtxt: + return + self.jid = msg_obj.jid + if msg_obj.session: + self.control = msg_obj.session.control + else: + self.control = None + self.get_focused() + # This event has already been added to event list + if not self.control and len(gajim.events.get_events(self.conn.name, \ + self.jid, [msg_obj.mtype])) <= 1: + self.first_unread = True + + if msg_obj.mtype == 'pm': + nick = msg_obj.resource + else: + nick = gajim.get_name_from_jid(self.conn.name, self.jid) + + if self.first_unread: + self.sound_event = 'first_message_received' + elif self.control_focused: + self.sound_event = 'next_message_received_focused' + else: + self.sound_event = 'next_message_received_unfocused' + + if gajim.config.get('notification_preview_message'): + self.popup_text = msg_obj.msgtxt + if self.popup_text and (self.popup_text.startswith('/me ') or \ + self.popup_text.startswith('/me\n')): + self.popup_text = '* ' + nick + self.popup_text[3:] + else: + # We don't want message preview, do_preview = False + self.popup_text = '' + if msg_obj.mtype == 'normal': # single message + self.popup_event_type = _('New Single Message') + self.popup_image = 'gajim-single_msg_recv' + self.popup_title = _('New Single Message from %(nickname)s') % \ + {'nickname': nick} + elif msg_obj.mtype == 'pm': + self.popup_event_type = _('New Private Message') + self.popup_image = 'gajim-priv_msg_recv' + self.popup_title = _('New Private Message from group chat %s') % \ + msg_obj.jid + if self.popup_text: + self.popup_text = _('%(nickname)s: %(message)s') % \ + {'nickname': nick, 'message': self.popup_text} + else: + self.popup_text = _('Messaged by %(nickname)s') % \ + {'nickname': nick} + else: # chat message + self.popup_event_type = _('New Message') + self.popup_image = 'gajim-chat_msg_recv' + self.popup_title = _('New Message from %(nickname)s') % \ + {'nickname': nick} + + self.popup_image = gtkgui_helpers.get_icon_path(self.popup_image, 48) + + if not gajim.config.get('notify_on_new_message') or \ + not self.first_unread: + self.do_popup = False + elif gajim.config.get('autopopupaway'): + # always show notification + self.do_popup = True + elif gajim.connections[self.conn.name].connected in (2, 3): + # we're online or chat + self.do_popup = True + + if self.first_unread and helpers.allow_sound_notification( + self.conn.name, 'first_message_received'): + self.do_sound = True + elif not self.first_unread and self.control_focused and \ + helpers.allow_sound_notification(self.conn.name, + 'next_message_received_focused'): + self.do_sound = True + elif not self.first_unread and not self.control_focused and \ + helpers.allow_sound_notification(self.conn.name, + 'next_message_received_unfocused'): + self.do_sound = True + + def handle_incoming_gc_msg_event(self, msg_obj): + sound = msg_obj.msg_obj.gc_control.highlighting_for_message( + msg_obj.msgtxt, msg_obj.timestamp)[1] + self.do_sound = True + if sound == 'received': + self.sound_event = 'muc_message_received' + elif sound == 'highlight': + self.sound_event = 'muc_message_highlight' + else: + self.do_sound = False + + self.do_popup = False + + def handle_incoming_pres_event(self, msg_obj): + pass + + def generate(self): + # what's needed to compute output + self.conn = self.base_event.conn + self.control = None + self.control_focused = False + self.first_unread = False + + # For output + self.do_sound = False + self.sound_file = '' + self.sound_event = '' # gajim sound played if not sound_file is set + self.show_popup = False + + self.do_popup = False + self.popup_title = '' + self.popup_text = '' + self.popup_event_type = '' + self.popup_msg_type = '' + self.popup_image = '' + + self.do_command = False + self.command = '' + + self.open_chat = False + self.activate_urgency_hint = False + self.show_in_notification_area = False + self.show_in_roster = False + + self.detect_type() + + if self.notif_type == 'msg': + self.handle_incoming_msg_event(self.base_event) + elif self.notif_type == 'gc-msg': + self.handle_incoming_gc_msg_event(self.base_event) + elif self.notif_type == 'pres': + self.handle_incoming_pres_event(self.base_event) + return True diff -r e821efda06c2 -r 2f323425ec8d src/common/gajim.py --- a/src/common/gajim.py Wed Apr 27 17:19:42 2011 +0200 +++ b/src/common/gajim.py Fri Apr 29 21:29:50 2011 +0200 @@ -35,6 +35,7 @@ import xmpp import defs import common.ged +import notify interface = None # The actual interface (the gtk one for the moment) thread_interface = None # Interface to run a thread and then a callback @@ -105,6 +106,8 @@ events = Events() +notification = notify.Notification() + nicks = {} # list of our nick names in each account # should we block 'contact signed in' notifications for this account? # this is only for the first 30 seconds after we change our show diff -r e821efda06c2 -r 2f323425ec8d src/common/ged.py --- a/src/common/ged.py Wed Apr 27 17:19:42 2011 +0200 +++ b/src/common/ged.py Fri Apr 29 21:29:50 2011 +0200 @@ -27,12 +27,17 @@ import logging log = logging.getLogger('gajim.common.ged') -PRECORE = 30 -CORE = 40 -POSTCORE = 50 +PRECORE = 10 +CORE = 20 +POSTCORE = 30 +PREGUI = 40 +PREGUI1 = 50 GUI1 = 60 -GUI2 = 70 -POSTGUI = 80 +POSTGUI1 = 70 +PREGUI2 = 80 +GUI2 = 90 +POSTGUI2 = 100 +POSTGUI = 110 class GlobalEventsDispatcher(object): @@ -68,4 +73,4 @@ if event_name in self.handlers: for priority, handler in self.handlers[event_name]: if handler(*args, **kwargs): - return + return True

1 0

gajim: allow WM to use several sizes of gajim icon so that it's ...
by Yann Leboulanger 27 Apr '11

27 Apr '11

changeset e821efda06c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e821efda06c2 description: allow WM to use several sizes of gajim icon so that it's nicer. Fixes #6839 diffstat: src/gui_interface.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (21 lines): diff -r 13d726bd7a75 -r e821efda06c2 src/gui_interface.py --- a/src/gui_interface.py Tue Apr 26 15:54:46 2011 +0200 +++ b/src/gui_interface.py Wed Apr 27 17:19:42 2011 +0200 @@ -2786,10 +2786,14 @@ import statusicon self.systray = statusicon.StatusIcon() - pix = gtkgui_helpers.get_icon_pixmap('gajim', 32) - if pix is not None: + pixs = [] + for size in (16, 32, 48, 64, 128): + pix = gtkgui_helpers.get_icon_pixmap('gajim', size) + if pix: + pixs.append(pix) + if pixs: # set the icon to all windows - gtk.window_set_default_icon(pix) + gtk.window_set_default_icon_list(*pixs) self.init_emoticons() self.make_regexps()

1 0

gajim: [misc] ability to request voice in moderated rooms. Fixes...
by Yann Leboulanger 26 Apr '11

26 Apr '11

changeset 13d726bd7a75 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=13d726bd7a75 description: [misc] ability to request voice in moderated rooms. Fixes #2266 diffstat: data/gui/gc_control_popup_menu.ui | 13 +++++++++++++ src/common/connection.py | 16 ++++++++++++++++ src/groupchat_control.py | 17 +++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diffs (105 lines): diff -r e59447e44e38 -r 13d726bd7a75 data/gui/gc_control_popup_menu.ui --- a/data/gui/gc_control_popup_menu.ui Tue Apr 26 14:29:07 2011 +0200 +++ b/data/gui/gc_control_popup_menu.ui Tue Apr 26 15:54:46 2011 +0200 @@ -67,6 +67,19 @@ </object> </child> <child> + <object class="GtkSeparatorMenuItem" id="request_voice_separator"> + <property name="no_show_all">True</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="request_voice_menuitem"> + <property name="label" translatable="yes">_Request Voice</property> + <property name="visible">True</property> + <property name="use_underline">True</property> + <property name="use_stock">False</property> + </object> + </child> + <child> <object class="GtkSeparatorMenuItem" id="bookmark_separator"> <property name="no_show_all">True</property> </object> diff -r e59447e44e38 -r 13d726bd7a75 src/common/connection.py --- a/src/common/connection.py Tue Apr 26 14:29:07 2011 +0200 +++ b/src/common/connection.py Tue Apr 26 15:54:46 2011 +0200 @@ -2496,6 +2496,22 @@ c.setTagData('reason', reason) self.connection.send(message) + def request_voice(self, room, nick): + """ + Request voice in a moderated room + """ + message = common.xmpp.Message(to=room) + + x = xmpp.DataForm(typ='submit') + x.addChild(node=xmpp.DataField(name='FORM_TYPE', + value=common.xmpp.NS_MUC + '#request')) + x.addChild(node=xmpp.DataField(name='muc#role', value='participant', + typ='text-single')) + + message.addChild(node=x) + + self.connection.send(message) + def check_pingalive(self): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect diff -r e59447e44e38 -r 13d726bd7a75 src/groupchat_control.py --- a/src/groupchat_control.py Tue Apr 26 14:29:07 2011 +0200 +++ b/src/groupchat_control.py Tue Apr 26 15:54:46 2011 +0200 @@ -789,8 +789,10 @@ change_subject_menuitem = xml.get_object('change_subject_menuitem') history_menuitem = xml.get_object('history_menuitem') minimize_menuitem = xml.get_object('minimize_menuitem') + request_voice_menuitem = xml.get_object('request_voice_menuitem') bookmark_separator = xml.get_object('bookmark_separator') separatormenuitem2 = xml.get_object('separatormenuitem2') + request_voice_separator = xml.get_object('request_voice_separator') if hide_buttonbar_items: change_nick_menuitem.hide() @@ -840,12 +842,17 @@ destroy_room_menuitem.set_sensitive(True) change_subject_menuitem.set_sensitive(True) change_nick_menuitem.set_sensitive(True) + if c.role == 'visitor': + request_voice_menuitem.set_sensitive(True) + else: + request_voice_menuitem.set_sensitive(False) else: # We are not connected to this groupchat, disable unusable menuitems configure_room_menuitem.set_sensitive(False) destroy_room_menuitem.set_sensitive(False) change_subject_menuitem.set_sensitive(False) change_nick_menuitem.set_sensitive(False) + request_voice_menuitem.set_sensitive(False) # connect the menuitems to their respective functions id_ = bookmark_room_menuitem.connect('activate', @@ -872,6 +879,10 @@ self._on_history_menuitem_activate) self.handlers[id_] = history_menuitem + id_ = request_voice_menuitem.connect('activate', + self._on_request_voice_menuitem_activate) + self.handlers[id_] = request_voice_menuitem + id_ = minimize_menuitem.connect('toggled', self.on_minimize_menuitem_toggled) self.handlers[id_] = minimize_menuitem @@ -2068,6 +2079,12 @@ gajim.interface.add_gc_bookmark(self.account, self.name, self.room_jid,\ '0', '0', password, self.nick) + def _on_request_voice_menuitem_activate(self, widget): + """ + Request voice in the current room + """ + gajim.connections[self.account].request_voice(self.room_jid) + def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): # Invite contact to groupchat

1 0

gajim: [adminX] don't send wrong mode value when sending bytestr...
by Yann Leboulanger 26 Apr '11

26 Apr '11

changeset e59447e44e38 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e59447e44e38 description: [adminX] don't send wrong mode value when sending bytestreams. Fixes #6868 diffstat: src/common/protocol/bytestream.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 6e4c6ae9baf8 -r e59447e44e38 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Apr 21 20:52:14 2011 +0200 +++ b/src/common/protocol/bytestream.py Tue Apr 26 14:29:07 2011 +0200 @@ -344,7 +344,6 @@ file_props['request-id'] = 'id_' + file_props['sid'] iq.setID(file_props['request-id']) query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) - query.setAttr('mode', 'plain') query.setAttr('sid', file_props['sid']) self._add_addiditional_streamhosts_to_query(query, file_props)

1 0

gajim: add advanced option to allow not saving roster position. ...
by Yann Leboulanger 21 Apr '11

21 Apr '11

changeset 6e4c6ae9baf8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6e4c6ae9baf8 description: add advanced option to allow not saving roster position. Fixes #5712 diffstat: src/common/config.py | 1 + src/roster_window.py | 14 ++++++++------ src/statusicon.py | 13 ++++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diffs (79 lines): diff -r db6bb1b227ec -r 6e4c6ae9baf8 src/common/config.py --- a/src/common/config.py Thu Apr 21 15:00:32 2011 +0200 +++ b/src/common/config.py Thu Apr 21 20:52:14 2011 +0200 @@ -147,6 +147,7 @@ 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], 'single-msg-height': [opt_int, 280], + 'save-roster-position': [opt_bool, True, _('If true, Gajim will save roster position when hiding roster, and restore it when showing roster.')], 'roster_x-position': [ opt_int, 0 ], 'roster_y-position': [ opt_int, 0 ], 'roster_width': [ opt_int, 200 ], diff -r db6bb1b227ec -r 6e4c6ae9baf8 src/roster_window.py --- a/src/roster_window.py Thu Apr 21 15:00:32 2011 +0200 +++ b/src/roster_window.py Thu Apr 21 20:52:14 2011 +0200 @@ -2337,9 +2337,10 @@ # in case show_roster_on_start is False and roster is never shown # window.window is None if self.window.window is not None: - x, y = self.window.window.get_root_origin() - gajim.config.set('roster_x-position', x) - gajim.config.set('roster_y-position', y) + if gajim.config.get('save-roster-position'): + x, y = self.window.window.get_root_origin() + gajim.config.set('roster_x-position', x) + gajim.config.set('roster_y-position', y) width, height = self.window.get_size() # For the width use the size of the vbox containing the tree and # status combo, this will cancel out any hpaned width @@ -6150,9 +6151,10 @@ gtkgui_helpers.resize_window(self.window, gajim.config.get('roster_width'), gajim.config.get('roster_height')) - gtkgui_helpers.move_window(self.window, - gajim.config.get('roster_x-position'), - gajim.config.get('roster_y-position')) + if gajim.config.get('save-roster-position'): + gtkgui_helpers.move_window(self.window, + gajim.config.get('roster_x-position'), + gajim.config.get('roster_y-position')) self.popups_notification_height = 0 self.popup_notification_windows = [] diff -r db6bb1b227ec -r 6e4c6ae9baf8 src/statusicon.py --- a/src/statusicon.py Thu Apr 21 15:00:32 2011 +0200 +++ b/src/statusicon.py Thu Apr 21 20:52:14 2011 +0200 @@ -396,7 +396,8 @@ # we could be in another VD right now. eg vd2 # and we want to show it in vd2 - if not gtkgui_helpers.possibly_move_window_in_current_desktop(win): + if not gtkgui_helpers.possibly_move_window_in_current_desktop( + win) and gajim.config.get('save-roster-position'): x, y = win.get_position() gajim.config.set('roster_x-position', x) gajim.config.set('roster_y-position', y) @@ -404,9 +405,10 @@ else: if not win.get_property('visible'): win.show_all() - gtkgui_helpers.move_window(win, - gajim.config.get('roster_x-position'), - gajim.config.get('roster_y-position')) + if gajim.config.get('save-roster-position'): + gtkgui_helpers.move_window(win, + gajim.config.get('roster_x-position'), + gajim.config.get('roster_y-position')) if not gajim.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(gtk.get_current_event_time()) @@ -418,7 +420,8 @@ if not event: return win = gajim.interface.roster.window - if not win.get_property('visible'): + if not win.get_property('visible') and gajim.config.get( + 'save-roster-position'): gtkgui_helpers.move_window(win, gajim.config.get('roster_x-position'), gajim.config.get('roster_y-position'))

1 0

gajim: don't allow to join a groupchat if we have a contact with...
by Yann Leboulanger 21 Apr '11

21 Apr '11

changeset db6bb1b227ec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=db6bb1b227ec description: don't allow to join a groupchat if we have a contact with the same JID. Fixes #5799 diffstat: src/dialogs.py | 11 ++++------- src/gui_interface.py | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diffs (46 lines): diff -r f139ada127a3 -r db6bb1b227ec src/dialogs.py --- a/src/dialogs.py Wed Apr 20 22:57:26 2011 +0200 +++ b/src/dialogs.py Thu Apr 21 15:00:32 2011 +0200 @@ -2443,13 +2443,10 @@ _('The group chat Jabber ID has not allowed characters.')) return - if gajim.interface.msg_win_mgr.has_window(room_jid, self.account): - ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, - self.account) - if ctrl.type_id != message_control.TYPE_GC: - ErrorDialog(_('This is not a group chat'), - _('%s is not the name of a group chat.') % room_jid) - return + if gajim.contacts.get_contact(self.account, room_jid): + ErrorDialog(_('This is not a group chat'), + _('%s is not the name of a group chat.') % room_jid) + return if room_jid in self.recently_groupchat: self.recently_groupchat.remove(room_jid) self.recently_groupchat.insert(0, room_jid) diff -r f139ada127a3 -r db6bb1b227ec src/gui_interface.py --- a/src/gui_interface.py Wed Apr 20 22:57:26 2011 +0200 +++ b/src/gui_interface.py Thu Apr 21 15:00:32 2011 +0200 @@ -1909,6 +1909,12 @@ """ Join the room immediately """ + + if gajim.contacts.get_contact(account, room_jid): + dialogs.ErrorDialog(_('This is not a group chat'), + _('%s is not the name of a group chat.') % room_jid) + return + if not nick: nick = gajim.nicks[account] @@ -2414,7 +2420,7 @@ 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'], + self.join_gc_room(account, jid, bm['nick'], bm['password'], minimize = minimize) elif jid in self.minimized_controls[account]: # more or less a hack:

1 0

gajim: don't send the converted to one line message, just save i...
by Yann Leboulanger 20 Apr '11

20 Apr '11

changeset f139ada127a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f139ada127a3 description: don't send the converted to one line message, just save it converted. diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ce347eca0a56 -r f139ada127a3 src/dialogs.py --- a/src/dialogs.py Wed Apr 20 22:45:03 2011 +0400 +++ b/src/dialogs.py Wed Apr 20 22:57:26 2011 +0200 @@ -1106,10 +1106,10 @@ start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() message = message_buffer.get_text(start_iter, end_iter).decode('utf-8') - message = helpers.to_one_line(message) if self.save_message_checkbutton.get_active(): + msg = helpers.to_one_line(message) gajim.config.set_per('accounts', self.account, - 'subscription_request_msg', message) + 'subscription_request_msg', msg) else: message= '' group = self.group_comboboxentry.child.get_text().decode('utf-8')

1 0

gajim: allow multiline invitation messages
by Denis Fomin 20 Apr '11

20 Apr '11

changeset ce347eca0a56 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce347eca0a56 description: allow multiline invitation messages diffstat: src/dialogs.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 22ffe33e941a -r ce347eca0a56 src/dialogs.py --- a/src/dialogs.py Tue Apr 19 14:36:22 2011 +0200 +++ b/src/dialogs.py Wed Apr 20 22:45:03 2011 +0400 @@ -1008,8 +1008,9 @@ if self.account: message_buffer = self.message_textview.get_buffer() - message_buffer.set_text(helpers.get_subscription_request_msg( + msg = helpers.from_one_line(helpers.get_subscription_request_msg( self.account)) + message_buffer.set_text(msg) gajim.ged.register_event_handler('gateway-prompt-received', ged.GUI1, self._nec_gateway_prompt_received) @@ -1105,6 +1106,7 @@ start_iter = message_buffer.get_start_iter() end_iter = message_buffer.get_end_iter() message = message_buffer.get_text(start_iter, end_iter).decode('utf-8') + message = helpers.to_one_line(message) if self.save_message_checkbutton.get_active(): gajim.config.set_per('accounts', self.account, 'subscription_request_msg', message)

1 0

gajim: use webbrowser module to open uri instead of using popen....
by Yann Leboulanger 19 Apr '11

19 Apr '11

changeset 22ffe33e941a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22ffe33e941a description: use webbrowser module to open uri instead of using popen. Fixes #5751 diffstat: src/common/helpers.py | 55 ++++++++++++++++++++------------------------------ src/config.py | 5 +--- src/gajim.py | 2 +- src/gtkgui_helpers.py | 29 -------------------------- src/gui_interface.py | 3 -- 5 files changed, 24 insertions(+), 70 deletions(-) diffs (175 lines): diff -r 1880b5dd2cdb -r 22ffe33e941a src/common/helpers.py --- a/src/common/helpers.py Tue Apr 19 08:54:41 2011 +0200 +++ b/src/common/helpers.py Tue Apr 19 14:36:22 2011 +0200 @@ -35,6 +35,7 @@ import os import subprocess import urllib +import webbrowser import errno import select import base64 @@ -671,30 +672,20 @@ return contacts_dict def launch_browser_mailer(kind, uri): - #kind = 'url' or 'mail' - if os.name == 'nt': - try: - os.startfile(uri) # if pywin32 is installed we open - except Exception: - pass + # kind = 'url' or 'mail' + if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): + uri = 'mailto:' + uri - else: - if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): - uri = 'mailto:' + uri + if kind == 'url' and uri.startswith('www.'): + uri = 'http://' + uri - if kind == 'url' and uri.startswith('www.'): - uri = 'http://' + uri - - if gajim.config.get('openwith') in ('xdg-open', 'gnome-open', - 'kfmclient exec', 'exo-open'): - command = gajim.config.get('openwith') - elif gajim.config.get('openwith') == 'custom': - if kind == 'url': - command = gajim.config.get('custombrowser') - elif kind in ('mail', 'sth_at_sth'): - command = gajim.config.get('custommailapp') - if command == '': # if no app is configured - return + if not gajim.config.get('autodetect_browser_mailer'): + if kind == 'url': + command = gajim.config.get('custombrowser') + elif kind in ('mail', 'sth_at_sth'): + command = gajim.config.get('custommailapp') + if command == '': # if no app is configured + return command = build_command(command, uri) try: @@ -702,18 +693,14 @@ except Exception: pass + else: + webbrowser.open(uri) + + def launch_file_manager(path_to_open): - if os.name == 'nt': - try: - os.startfile(path_to_open) # if pywin32 is installed we open - except Exception: - pass - else: - if gajim.config.get('openwith') in ('xdg-open', 'gnome-open', - 'kfmclient exec', 'exo-open'): - command = gajim.config.get('openwith') - elif gajim.config.get('openwith') == 'custom': - command = gajim.config.get('custom_file_manager') + uri = 'file://' + path_to_open + if not gajim.config.get('autodetect_browser_mailer'): + command = gajim.config.get('custom_file_manager') if command == '': # if no app is configured return command = build_command(command, path_to_open) @@ -721,6 +708,8 @@ exec_command(command) except Exception: pass + else: + webbrowser.open(uri) def play_sound(event): if not gajim.config.get('sounds_on'): diff -r 1880b5dd2cdb -r 22ffe33e941a src/config.py --- a/src/config.py Tue Apr 19 08:54:41 2011 +0200 +++ b/src/config.py Tue Apr 19 14:36:22 2011 +0200 @@ -504,9 +504,7 @@ if gajim.config.get('autodetect_browser_mailer'): self.applications_combobox.set_active(0) - # else autodetect_browser_mailer is False. - # so user has 'Always Use GNOME/KDE/Xfce' or Custom - elif gajim.config.get('openwith') == 'custom': + else: self.applications_combobox.set_active(1) self.xml.get_object('custom_apps_frame').show() @@ -1146,7 +1144,6 @@ elif widget.get_active() == 1: gajim.config.set('autodetect_browser_mailer', False) self.xml.get_object('custom_apps_frame').show() - gajim.config.set('openwith', 'custom') gajim.interface.save_config() def on_custom_browser_entry_changed(self, widget): diff -r 1880b5dd2cdb -r 22ffe33e941a src/gajim.py --- a/src/gajim.py Tue Apr 19 08:54:41 2011 +0200 +++ b/src/gajim.py Tue Apr 19 14:36:22 2011 +0200 @@ -40,7 +40,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] import os import sys diff -r 1880b5dd2cdb -r 22ffe33e941a src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Apr 19 08:54:41 2011 +0200 +++ b/src/gtkgui_helpers.py Tue Apr 19 14:36:22 2011 +0200 @@ -221,35 +221,6 @@ return None -def autodetect_browser_mailer(): - # recognize the environment and set appropriate browser/mailer - if user_supports_xdg_open(): - gajim.config.set('openwith', 'xdg-open') - elif user_runs_gnome(): - gajim.config.set('openwith', 'gnome-open') - elif user_runs_kde(): - gajim.config.set('openwith', 'kfmclient exec') - elif user_runs_xfce(): - gajim.config.set('openwith', 'exo-open') - else: - gajim.config.set('openwith', 'custom') - -def user_supports_xdg_open(): - import os.path - return os.path.isfile('/usr/bin/xdg-open') - -def user_runs_gnome(): - return 'gnome-session' in get_running_processes() - -def user_runs_kde(): - return 'startkde' in get_running_processes() - -def user_runs_xfce(): - procs = get_running_processes() - if 'startxfce4' in procs or 'xfce4-session' in procs: - return True - return False - def get_running_processes(): """ Return running processes or None (if /proc does not exist) diff -r 1880b5dd2cdb -r 22ffe33e941a src/gui_interface.py --- a/src/gui_interface.py Tue Apr 19 08:54:41 2011 +0200 +++ b/src/gui_interface.py Tue Apr 19 14:36:22 2011 +0200 @@ -2649,9 +2649,6 @@ gajim.config.set_per('themes', theme_name, o, theme[d.index(o)]) - if gajim.config.get('autodetect_browser_mailer') or not cfg_was_read: - gtkgui_helpers.autodetect_browser_mailer() - gajim.idlequeue = idlequeue.get_idlequeue() # resolve and keep current record of resolved hosts gajim.resolver = resolver.get_resolver(gajim.idlequeue)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2011