Changeset 7787 for branches/gajim_0.11/src

Timestamp:

01/06/07 12:00:50 (2 years ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Location:

branches/gajim_0.11/src

Files:

• chat_control.py (modified) (1 diff)
• common/check_paths.py (modified) (4 diffs)
• common/configpaths.py (modified) (4 diffs)
• common/config.py (modified) (5 diffs)
• common/connection_handlers.py (modified) (7 diffs)
• common/contacts.py (modified) (1 diff)
• common/fuzzyclock.py (modified) (3 diffs)
• common/gajim.py (modified) (1 diff)
• common/helpers.py (modified) (1 diff)
• common/idle.c (modified) (6 diffs)
• common/logger.py (modified) (2 diffs)
• common/optparser.py (modified) (5 diffs)
• common/passwords.py (modified) (3 diffs)
• common/sleepy.py (modified) (4 diffs)
• common/xmpp/protocol.py (modified) (1 diff)
• config.py (modified) (22 diffs)
• conversation_textview.py (modified) (1 diff)
• dialogs.py (modified) (4 diffs)
• filetransfers_window.py (modified) (3 diffs)
• gajim.py (modified) (7 diffs)
• gajim-remote.py (modified) (5 diffs)
• groupchat_control.py (modified) (3 diffs)
• gtkgui_helpers.py (modified) (2 diffs)
• htmltextview.py (modified) (1 diff)
• message_control.py (modified) (1 diff)
• network_manager_listener.py (modified) (1 diff)
• profile_window.py (modified) (4 diffs)
• remote_control.py (modified) (4 diffs)
• roster_window.py (modified) (30 diffs)

branches/gajim_0.11/src/chat_control.py

@@ -50 +50 @@
 #LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #echo "{_('en'):'en'",$LANG"}"
-langs = {_('English'): 'en', _('Bulgarian'): 'bg', _('Briton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basc'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norvegian b'): 'nb', _('Dutch'): 'nl', _('Norvegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
+langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg', _('Briton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basc'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
 
 

branches/gajim_0.11/src/common/check_paths.py

@@ -87 +87 @@
         dot_gajim = os.path.dirname(VCARD_PATH)
         if os.path.isfile(dot_gajim):
-                print _('%s is file but it should be a directory') % dot_gajim
+                print _('%s is a file but it should be a directory') % dot_gajim
                 print _('Gajim will now exit')
                 sys.exit()
@@ -98 +98 @@
                         create_path(VCARD_PATH)
                 elif os.path.isfile(VCARD_PATH):
-                        print _('%s is file but it should be a directory') % VCARD_PATH
+                        print _('%s is a file but it should be a directory') % VCARD_PATH
                         print _('Gajim will now exit')
                         sys.exit()
@@ -105 +105 @@
                         create_path(AVATAR_PATH)
                 elif os.path.isfile(AVATAR_PATH):
-                        print _('%s is file but it should be a directory') % AVATAR_PATH
+                        print _('%s is a file but it should be a directory') % AVATAR_PATH
                         print _('Gajim will now exit')
                         sys.exit()
@@ -113 +113 @@
                         gajim.logger.init_vars()
                 elif os.path.isdir(LOG_DB_PATH):
-                        print _('%s is directory but should be file') % LOG_DB_PATH
+                        print _('%s is a directory but should be a file') % LOG_DB_PATH
                         print _('Gajim will now exit')
                         sys.exit()

branches/gajim_0.11/src/common/configpaths.py

@@ -42 +42 @@
                                 except KeyError:
                                         # win9x, in cwd
-                                        self.root = u''
+                                        self.root = u'.'
                         else: # Unices
                                 # Pass in an Unicode string, and hopefully get one back.
@@ -88 +88 @@
 
         paths.add('DATA', os.path.join(u'..', windowsify(u'data')))
-        paths.add('HOME', os.path.expanduser(u'~'))
+        paths.add('HOME', fse(os.path.expanduser('~')))
         paths.add('TMP', fse(tempfile.gettempdir()))
 
@@ -97 +97 @@
                 pass
 
-        #for k, v in paths.iteritems():
-        #       print "%s: %s" % (k, v)
+        # for k, v in paths.iteritems():
+        #       print "%s: %s" % (repr(k), repr(v))
 
         return paths
@@ -114 +114 @@
         paths.add_from_root('CONFIG_FILE', conffile)
         paths.add_from_root('PID_FILE', pidfile)
+
+        # for k, v in paths.iteritems():
+        #       print "%s: %s" % (repr(k), repr(v))

branches/gajim_0.11/src/common/config.py

@@ -39 +39 @@
 opt_color = [ 'color', '^(#[0-9a-fA-F]{6})|()$' ]
 opt_one_window_types = ['never', 'always', 'peracct', 'pertype']
+opt_treat_incoming_messages = ['', 'chat', 'normal']
 
 class Config:
@@ -90 +91 @@
                 'speller_language': [ opt_str, '', _('Language used by speller')],
                 'print_time': [ opt_str, 'always',  _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')],
-                'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. This is used only if print_time is \'sometimes\'.') ],
+                'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.') ],
                 'emoticons_theme': [opt_str, 'static', '', True ],
                 'ascii_formatting': [ opt_bool, True,
@@ -189 +190 @@
                 'muc_highlight_words': [opt_str, '', _('A semicolon-separated list of words that will be highlighted in group chats.')],
                 'quit_on_roster_x_button': [opt_bool, False, _('If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used.')],
-                'set_xmpp://_handler_everytime': [opt_bool, False, _('If True, Gajim registers for xmpp:// on each startup.')],
+                'check_if_gajim_is_default': [opt_bool, True, _('If True, Gajim will check if it\'s the default jabber client on each startup.')],
                 'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')],
                 'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window.'), True],
@@ -195 +196 @@
                 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')],
                 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')],
-                'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", gajim will only print FOO enters/leaves group chat.')],
+                'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')],
                 'log_contact_status_changes': [opt_bool, False],
                 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')],
@@ -217 +218 @@
                 'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')],
                 'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')],
-                'chat_merge_consecutive_nickname_indent': [opt_str, '  ', _('Indentation when using merge consecutive nickame.')],
+                'chat_merge_consecutive_nickname_indent': [opt_str, '  ', _('Indentation when using merge consecutive nickname.')],
                 'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in group chats.'), True ],
                 'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')],
                 'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')],
-                'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFULL, when you are logged in with a negative priority, you will NOT receive any message from your server.')],
+                'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')],
+                'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')],
+                'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')],
+                'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')],
         }
 

branches/gajim_0.11/src/common/connection_handlers.py

@@ -25 +25 @@
 import sys
 
-from time import localtime, strftime, gmtime
+from time import localtime, strftime, gmtime, timezone
 from calendar import timegm
 
@@ -1315 +1315 @@
                 raise common.xmpp.NodeProcessed
 
-        
+        def _TimeRevisedCB(self, con, iq_obj):
+                gajim.log.debug('TimeRevisedCB')
+                iq_obj = iq_obj.buildReply('result')
+                qp = iq_obj.setTag('time')
+                qp.setTagData('utc', strftime("%Y-%m-%dT%TZ", gmtime()))
+                qp.setTagData('tzo', "%+03d:00"% (time.timezone/(60*60)))
+                self.connection.send(iq_obj)
+                raise common.xmpp.NodeProcessed
+
         def _gMailNewMailCB(self, con, gm):
                 '''Called when we get notified of new mail messages in gmail account'''
@@ -1439 +1447 @@
                         self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt,
                                 tim))
+                        return
                 elif mtype == 'groupchat':
                         has_timestamp = False
@@ -1452 +1461 @@
                                         return
                                 self.dispatch('GC_MSG', (frm, msgtxt, tim, has_timestamp, msghtml))
-                                if self.name not in no_log_for and not int(float(time.mktime(tim))) <= \
-                                        self.last_history_line[jid] and msgtxt:
+                                if self.name not in no_log_for and not int(float(time.mktime(tim)))\
+                                <= self.last_history_line[jid] and msgtxt:
                                         gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
+                        return
                 elif mtype == 'chat': # it's type 'chat'
                         if not msg.getTag('body') and chatstate is None: #no <body>
@@ -1462 +1472 @@
                                 msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim,
                                         subject = subject)
-                        self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject,
-                                                chatstate, msg_id, composing_jep, user_nick, msghtml))
                 else: # it's single message
                         if invite is not None:
@@ -1476 +1484 @@
                                 gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
                                         subject = subject)
-                        self.dispatch('MSG', (frm, msgtxt, tim, encrypted, 'normal',
-                                subject, chatstate, msg_id, composing_jep, user_nick, msghtml))
+                        mtype = 'normal'
+                treat_as = gajim.config.get('treat_incoming_messages')
+                if treat_as:
+                        mtype = treat_as
+                self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype,
+                        subject, chatstate, msg_id, composing_jep, user_nick, msghtml))
         # END messageCB
 
@@ -1963 +1975 @@
                 con.RegisterHandler('iq', self._TimeCB, 'get',
                         common.xmpp.NS_TIME)
+                con.RegisterHandler('iq', self._TimeRevisedCB, 'get',
+                        common.xmpp.NS_TIME_REVISED)
                 con.RegisterHandler('iq', self._LastCB, 'get',
                         common.xmpp.NS_LAST)

branches/gajim_0.11/src/common/contacts.py

@@ -265 +265 @@
                                         continue
                                 if common.gajim.jid_is_transport(jid) and not \
-                                common.gajim.config.get('show_transports_group'):
+                                        _('Transports') in groups:
                                         # do not count transports
                                         continue
                                 contact = self.get_contact_with_highest_priority(account, jid)
+                                if _('Not in roster') in contact.groups:
+                                        continue
                                 in_groups = False
                                 if groups == []:

branches/gajim_0.11/src/common/fuzzyclock.py

@@ -45 +45 @@
 
         #Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
-        self.__normalFuzzy = [ _("%0 o'clock"), _('five past %0'), _('ten past %0'),
-                               _('quarter past %0'), _('twenty past %0'),
-                               _('twenty five past %0'), _('half past %0'),
-                               _('twenty five to %1'), _('twenty to %1'),
-                               _('quarter to %1'), _('ten to %1'), _('five to %1'),
-                               _("%1 o'clock") ]
+        self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'),
+                                                                                _('ten past $0'), _('quarter past $0'),
+                                                                                _('twenty past $0'), _('twenty five past $0'),
+                                                                                _('half past $0'), _('twenty five to $1'),
+                                                                                _('twenty to $1'), _('quarter to $1'),
+                                                                                _('ten to $1'), _('five to $1'), _("$1 o'clock") ]
 
         #A "singular-form". It is used when talking about hour 0
-        self.__normalFuzzyOne = [ _("%0 o'clock"), _('five past %0'),
-                                  _('ten past %0'), _('quarter past %0'),
-                                  _('twenty past %0'), _('twenty five past %0'),
-                                  _('half past %0'), _('twenty five to %1'),
-                                  _('twenty to %1'), _('quarter to %1'),
-                                  _('ten to %1'), _('five to %1'), _("%1 o'clock") ]
+        self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'),
+                                  _('ten past $0'), _('quarter past $0'),
+                                  _('twenty past $0'), _('twenty five past $0'),
+                                  _('half past $0'), _('twenty five to $1'),
+                                  _('twenty to $1'), _('quarter to $1'),
+                                  _('ten to $1'), _('five to $1'),
+                                                                                         _("$1 o'clock") ]
+
 
         self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'),
@@ -103 +105 @@
 
             newTimeStr = self.__normalFuzzy[sector]
-            #%0 or %1?
-            deltaHour = int(newTimeStr[newTimeStr.find("%")+1])
+            #$0 or $1?
+            deltaHour = int(newTimeStr[newTimeStr.find("$")+1])
 
             if (self.__hour + deltaHour) % 12 > 0:
@@ -114 +116 @@
                 newTimeStr = self.__normalFuzzyOne[sector]
 
-            newTimeStr = newTimeStr.replace("%"+str(deltaHour),
+            newTimeStr = newTimeStr.replace("$"+str(deltaHour),
                                             self.__hourNames[realHour])
 

branches/gajim_0.11/src/common/gajim.py

@@ -121 +121 @@
 status_before_autoaway = {}
 
+# jid of transport contacts for which we need to ask avatar when transport will
+# be online
+transport_avatar = {} # {transport_jid: [jid_list]}
+
 SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd',
         'invisible']

branches/gajim_0.11/src/common/helpers.py

@@ -350 +350 @@
                 return _('is composing a message...')
         elif chatstate == 'paused':
-                #paused means he or she was compoing but has stopped for a while
+                #paused means he or she was composing but has stopped for a while
                 return _('paused composing a message')
         elif chatstate == 'gone':

branches/gajim_0.11/src/common/idle.c

@@ -6 +6 @@
  * Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org>
  *                         Vincent Hanquez <tab@snarc.org>
- * Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
- *                    Vincent Hanquez <tab@snarc.org>
+ * Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org>
  *                    Nikos Kouremenos <nkour@jabber.org>
- *                    Dimitur Kirov <dkirov@gmail.com>
- *                    Travis Shirk <travis@pobox.com>
- *                    Norman Rasmussen <norman@rasmussen.co.za>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -27 +23 @@
         #include <X11/Xutil.h>
         #include <X11/extensions/scrnsaver.h>
-#else
-        #define _WIN32_WINNT 0x0500
-        #include <windows.h>
-        #define EXPORT __declspec(dllexport)
 #endif
 
 #include <Python.h>
 
-#ifdef _WIN32
-        typedef BOOL (WINAPI *GETLASTINPUTINFO)(LASTINPUTINFO *);
-        static HMODULE g_user32 = NULL;
-        static GETLASTINPUTINFO g_GetLastInputInfo = NULL;
-#else
+#ifndef _WIN32
         Display *display;
 #endif
@@ -48 +36 @@
 #ifndef _WIN32
         display = XOpenDisplay(NULL);
-#else
-        g_user32 = LoadLibrary("user32.dll");
-        if (g_user32) {
-                g_GetLastInputInfo = (GETLASTINPUTINFO)GetProcAddress(g_user32, "GetLastInputInfo");
-        }
 #endif
         Py_INCREF(Py_None);
@@ -63 +46 @@
         static XScreenSaverInfo *mit_info = NULL;
         int idle_time, event_base, error_base;
-#else
-        int idle_time = 0;
 #endif
 
@@ -77 +58 @@
         else
                 idle_time = 0;
-#else
-        if (g_GetLastInputInfo != NULL) {
-                LASTINPUTINFO lii;
-                memset(&lii, 0, sizeof(lii));
-                lii.cbSize = sizeof(lii);
-                if (g_GetLastInputInfo(&lii)) {
-                        idle_time = lii.dwTime;
-                }
-                idle_time = (GetTickCount() - idle_time) / 1000;
-        }                                                                       
 #endif
         return Py_BuildValue("i", idle_time);
@@ -95 +66 @@
 #ifndef _WIN32
         XCloseDisplay(display);
-#else
-        if (g_user32 != NULL)
-                FreeLibrary(g_user32);
 #endif
         Py_INCREF(Py_None);

branches/gajim_0.11/src/common/logger.py

@@ -32 +32 @@
 import configpaths
 LOG_DB_PATH = configpaths.gajimpaths['LOG_DB']
+LOG_DB_FOLDER, LOG_DB_FILE = os.path.split(LOG_DB_PATH)
 
 class Constants:
@@ -98 +99 @@
                 self.close_db()
 
+                # FIXME: sqlite3_open wants UTF8 strings. So a path with
+                # non-ascii chars doesn't work. See #2812 and
+                # http://lists.initd.org/pipermail/pysqlite/2005-August/000134.html
+                back = os.getcwd()
+                os.chdir(LOG_DB_FOLDER)
+
                 # if locked, wait up to 20 sec to unlock
                 # before raise (hopefully should be enough)
-                self.con = sqlite.connect(LOG_DB_PATH, timeout = 20.0,
+
+                self.con = sqlite.connect(LOG_DB_FILE, timeout = 20.0,
                         isolation_level = 'IMMEDIATE')
+                os.chdir(back)
                 self.cur = self.con.cursor()
                 self.set_synchronous(False)

branches/gajim_0.11/src/common/optparser.py

@@ -99 +99 @@
         def write(self):
                 (base_dir, filename) = os.path.split(self.__filename)
-                try:
-                        base_dir = base_dir.decode(sys.getfilesystemencoding())
-                        filename = filename.decode(sys.getfilesystemencoding())
-                except:
-                        pass
                 self.__tempfile = os.path.join(base_dir, '.' + filename)
                 try:
@@ -212 +207 @@
         def assert_unread_msgs_table_exists(self):
                 '''create table unread_messages if there is no such table'''
-                con = sqlite.connect(logger.LOG_DB_PATH) 
+                #FIXME see #2812
+                back = os.getcwd()
+                os.chdir(logger.LOG_DB_FOLDER)
+                con = sqlite.connect(logger.LOG_DB_FILE)
+                os.chdir(back)
                 cur = con.cursor()
                 try:
@@ -281 +280 @@
         def update_config_to_01013(self):
                 '''create table transports_cache if there is no such table'''
-                con = sqlite.connect(logger.LOG_DB_PATH) 
+                #FIXME see #2812
+                back = os.getcwd()
+                os.chdir(logger.LOG_DB_FOLDER)
+                con = sqlite.connect(logger.LOG_DB_FILE)
+                os.chdir(back)
                 cur = con.cursor()
                 try:
@@ -300 +303 @@
         def update_config_to_01014(self):
                 '''apply indeces to the logs database'''
-                print _('migrating logs database to indeces')
-                con = sqlite.connect(logger.LOG_DB_PATH) 
+                print _('migrating logs database to indices')
+                #FIXME see #2812
+                back = os.getcwd()
+                os.chdir(logger.LOG_DB_FOLDER)
+                con = sqlite.connect(logger.LOG_DB_FILE)
+                os.chdir(back)
                 cur = con.cursor()
                 # apply indeces
@@ -320 +327 @@
         def update_config_to_01015(self):
                 '''clean show values in logs database'''
-                con = sqlite.connect(logger.LOG_DB_PATH)
+                #FIXME see #2812
+                back = os.getcwd()
+                os.chdir(logger.LOG_DB_FOLDER)
+                con = sqlite.connect(logger.LOG_DB_FILE)
+                os.chdir(back)
                 cur = con.cursor()
                 status = dict((i[5:].lower(), logger.constants.__dict__[i]) for i in \

branches/gajim_0.11/src/common/passwords.py

@@ -19 +19 @@
 from common import gajim
 
-try:
-        import gnomekeyring
-except ImportError:
-        USER_USES_GNOMEKEYRING = False
-else:
-        if gnomekeyring.is_available():
-                USER_USES_GNOMEKEYRING = True
+USER_HAS_GNOMEKEYRING = False
+USER_USES_GNOMEKEYRING = False
+if gajim.config.get('use_gnomekeyring'):
+        try:
+                import gnomekeyring
+        except ImportError:
+                pass