Changeset 7787 for branches/gajim_0.11/src/gtkgui_helpers.py

Timestamp:

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

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

• branches/gajim_0.11/src/gtkgui_helpers.py (modified) (2 diffs)

branches/gajim_0.11/src/gtkgui_helpers.py

@@ -578 +578 @@
 def possibly_set_gajim_as_xmpp_handler():
         '''registers (by default only the first time) xmmp: to Gajim.'''
-        try:
-                import gconf
-                # in try because daemon may not be there
-                client = gconf.client_get_default()
-        except:
-                return
-        
-        
         path_to_dot_kde = os.path.expanduser('~/.kde')
         if os.path.exists(path_to_dot_kde):
                 path_to_kde_file = os.path.join(path_to_dot_kde, 
                         'share/services/xmpp.protocol')
-                if not os.path.exists(path_to_kde_file):
-                        path_to_kde_file = None
         else:
                 path_to_kde_file = None
-        
-        if gajim.config.get('set_xmpp://_handler_everytime'):
-                        # it's false by default
-                        we_set = True
-        elif client.get_string('/desktop/gnome/url-handlers/xmpp/command') is None:
-                # only the first time (GNOME/GCONF)
-                we_set = True
-        elif path_to_kde_file is not None and not os.path.exists(path_to_kde_file):
-                # only the first time (KDE)
-                we_set = True
-        else:
-                we_set = False
-                
-        if not we_set:
-                return
-        
-        path_to_gajim_script, typ = get_abspath_for_script('gajim-remote', True)
-        if path_to_gajim_script:
-                if typ == 'svn':
-                        command = path_to_gajim_script + ' open_chat %s'
-                else: # 'installed'
-                        command = 'gajim-remote open_chat %s'
-                
-                # setting for GNOME/Gconf
-                client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True)
-                client.set_string('/desktop/gnome/url-handlers/xmpp/command', command)
-                client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', False)
-                
-                # setting for KDE
-                if path_to_kde_file is not None: # user has run kde at least once
-                        f = open(path_to_kde_file, 'w')
-                        f.write('''\
+
+        def set_gajim_as_xmpp_handler(widget = None):
+                if widget:
+                        # come from confirmation dialog
+                        gajim.config.set('check_if_gajim_is_default',
+                                dlg.checkbutton.get_active())
+                        dlg.destroy()
+                path_to_gajim_script, typ = get_abspath_for_script('gajim-remote', True)
+                if path_to_gajim_script:
+                        if typ == 'svn':
+                                command = path_to_gajim_script + ' handle_uri %s'
+                        else: # 'installed'
+                                command = 'gajim-remote handle_uri %s'
+
+                        # setting for GNOME/Gconf
+                        client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True)
+                        client.set_string('/desktop/gnome/url-handlers/xmpp/command', command)
+                        client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', False)
+
+                        # setting for KDE
+                        if path_to_kde_file is not None: # user has run kde at least once
+                                try:
+                                        f = open(path_to_kde_file, 'a')
+                                        f.write('''\
 [Protocol]
 exec=%s "%%u"
@@ -640 +622 @@
 Description=xmpp
 ''' % command)
-                        f.close()
+                                        f.close()
+                                except:
+                                        pass
+
+        try:
+                import gconf
+                # in try because daemon may not be there
+                client = gconf.client_get_default()
+        except:
+                return
+
+        old_command = client.get_string('/desktop/gnome/url-handlers/xmpp/command')
+        if not old_command or old_command.endswith(' open_chat %s'):
+                # first time (GNOME/GCONF) or old Gajim version
+                we_set = True
+        elif path_to_kde_file is not None and not os.path.exists(path_to_kde_file):
+                # only the first time (KDE)
+                we_set = True
+        else:
+                we_set = False
+
+        if we_set:
+                set_gajim_as_xmpp_handler()
+        elif old_command and not old_command.endswith(' handle_uri %s'):
+                # xmpp: is currently handled by another program, so ask the user
+                pritext = _('Gajim is not the default Jabber client')
+                sectext = _('Would you like to make Gajim the default Jabber client?')
+                checktext = _('Always check to see if Gajim is the default Jabber client '
+                        'on startup')
+                def on_cancel(widget):
+                        gajim.config.set('check_if_gajim_is_default',
+                                dlg.checkbutton.get_active())
+                        dlg.destroy()
+                dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, checktext,
+                        set_gajim_as_xmpp_handler, on_cancel)
+                if gajim.config.get('check_if_gajim_is_default'):
+                        dlg.checkbutton.set_active(True)
 
 def escape_underscore(s):