Merge lp:~sense/lernid/connection-change into lp:lernid

[Sense Egbert Hofstede]

[Sense Egbert Hofstede (sense)]

This change is a bit radical and solves bug #496516 by removing the Connection dialogue completely. Completely? Yes, completely. However, its content is copied to a separate GtkAlignment that was added in the 'main_vbox' just under the GtkAlignment containing the main content. I've named the first 'alignment_connect' and renamed the latter to 'alignment_loaded'.

From a user perspective you could say that the connection part is loaded 'on top' of the actual window content. By default 'alignment_loaded' is hidden and 'alignment_connect' is shown. When you connect this is inverted. Maybe in the future a nice fade in/out animation could be added! ;)
When pressing "Connect" in the menu, 'alignment_loaded' is hidden again and 'alignment_connect' is shown again. All fields are still in the same state as when the user pressed Connect, so (s)he won't have to enter his/her nickname again.

File->Disconnect is now insensitive when you aren't connected.

I've forgot to mention it in the changelog, but now Lernid also refuses to process the connection request if the nickname field is empty, the Connect button simply doesn't work. (Of course, it does actually work, but it stops all processing when the nickname is empty.)

I realise that the interface change is a large one, so you might not like it. It's just a proposal, so don't feel bad when you decline it!

(Where the small fixes extras to push you over the line? Maybe! But they can probably easily be taken out of the diff and be implemented anyway.)

[Jono Bacon (jonobacon)]

Thanks for the patch, Sense! I am not particularly keen on the user interface change and I don't see what particular usability issues it resolves. Maybe this is something we could investigate post 1.0 if you still feel there is work to be done?

[Jono Bacon (jonobacon)]

review: Disapprove

[Sense Egbert Hofstede (sense)]

I understand why you reject it. I'm not that fond of its look as well, but I do think that getting rid of the dialogue is worth it.
Because that was the main reason I did this, instead of two separate windows -- one of which is insensitive -- there is now just one window.
It also provides more space than the connection dialogue does, eventually this stage of the user's participation to an event could be used for explaining Lernid and the used tools.
When there 1.0 has been released there will be more time to investigate different approaches to the UI, maybe then we could have a look at this idea again, that is, if it is still applicable to the Lernid interface.

I'll take the fixes out of this branch and submit a separate merge proposal for them.

Unmerged revisions

75. By Sense Egbert Hofstede on 2009-12-24

* Moved the definition of self.irc to LernidWindow.finish_initializing() and added 'self.conn = None' to IrcBackend.Irc.__init__(); this is part of the fix for LP #496516
* Removed ConnectDialog, replacing its functionality with an GtkAlignment added to LeridWindow. The connection form now sits 'on top' of the window content; this is the rest of the fix for LP #496516
* 'menu_disconnect' is now insensitive when there is no connection and sensitive when there is

=== modified file 'bin/lernid'
--- bin/lernid	2009-12-24 01:34:45 +0000
+++ bin/lernid	2009-12-24 15:49:12 +0000
@@ -25,6 +25,7 @@
 import pynotify
 import gettext
 import gio
+import gobject
 import vobject
 import time
 import datetime
@@ -46,7 +47,7 @@
     fullPath = os.getcwd()
 sys.path.insert(0, os.path.dirname(fullPath))
 
-from lernid import AboutLernidDialog, PreferencesLernidDialog, ConnectDialog, IrcBackend
+from lernid import AboutLernidDialog, PreferencesLernidDialog, IrcBackend
 from lernid.lernidconfig import getdatapath, save_cache_path
 
 class LernidWindow(gtk.Window):
@@ -78,12 +79,9 @@
         #dlg = PreferencesLernidDialog.NewPreferencesLernidDialog()
         #self.preferences = dlg.get_preferences()
 
-        #code for other initialization actions should be added here
-
-        # set up configuration file directory
-        
         self.setup_notifications()
-        
+
+        # set up data, configuration and cache directories
         self.lernidcachefolder = save_cache_path('lernid')
         self.lerniddatafolder = xdg.BaseDirectory.save_data_path('lernid')
         self.lernidcachefolder_events = os.path.join(self.lernidcachefolder, "events")
@@ -95,12 +93,15 @@
             self.monitor.connect("changed", self.classroom_log_changed)
             
         # set up views
-        
+
+        self.alignment_connect = self.builder.get_object("alignment_connect")
+        self.alignment_loaded = self.builder.get_object("alignment_loaded")
         self.browser_scroll = self.builder.get_object("browser_scroll")
         self.classroom_textview = self.builder.get_object("classroom_textview")
         self.classroom_scroll = self.builder.get_object("classroom_scroll")        
         self.classroom_scrollbar = self.builder.get_object("adjustment1")        
-        self.chat_scroll = self.builder.get_object("chat_scroll")                           
+        self.chat_scroll = self.builder.get_object("chat_scroll")   
+        self.irc = IrcBackend.Irc()                        
         self.main_window = self.builder.get_object("lernid_window")
         self.browser_combo = self.builder.get_object("browser_combo")
         self.slide_scroll = self.builder.get_object("slide_scroll")
@@ -141,8 +142,6 @@
         self.eventhomepage = None
 
         self.chat.grab_focus()
-                
-        self.main_window.show_all()
 
         self.browser.hide()
         self.chat.hide()
@@ -177,7 +176,8 @@
         self.tvcolumn.set_attributes(self.cell_time, text=2)
         self.tvcolumn.set_attributes(self.cell_title, text=3)
 
-        self.connect_dialog(None)
+        # ready the connection selector for use
+        self.populate_connection_view()
 
     def change_slide(self, slidenumber):
         firstpage = "-dFirstPage=" + str(slidenumber)
@@ -345,6 +345,42 @@
                     urllib.urlretrieve(sess['slides'], os.path.join(self.lerniddatafolder, "slides.pdf"))
                     self.currentsession_downloadedslides = True
                 
+    def populate_connection_view(self):
+        # download event data
+        config = ConfigParser.ConfigParser()
+        
+        urllib.urlretrieve('http://www.jonobacon.org/files/lernid/ubuntu.lernid', os.path.join(self.lernidcachefolder_events, "config.lernid"))
+        #output = open(os.path.join(self.lernidcachefolder_events, "temp.txt"),'wb')
+        
+        #output.write(response.read())
+        #output.close
+
+        # copy file
+        
+        #shutil.copy(os.path.join(self.lernidcachefolder_events, "temp.txt"),os.path.join(self.lernidcachefolder_events, "ubuntu.txt"))
+
+        # read file
+        
+        config.read(os.path.join(self.lernidcachefolder_events, "config.lernid"))
+
+        sections = config.sections()
+        logging.debug(sections)
+        
+        store = gtk.ListStore(gobject.TYPE_STRING)
+        
+        logging.debug("sections")
+        for s in sections:
+            logging.debug(s)
+            store.append([s])
+
+        self.event_combo = self.builder.get_object("event_combo")
+
+        self.event_combo.set_model(store)
+        cell = gtk.CellRendererText()
+        self.event_combo.pack_start(cell, True)
+        self.event_combo.add_attribute(cell, 'text',0)
+        self.event_combo.set_active(0)
+
     def populate_schedule_view(self):
         """Populate the schedule Treeview with events"""
 
@@ -417,19 +453,40 @@
         n = pynotify.Notification(s)
         n.show()
                 
+    def connect_cancel(self, widget):
+        """Connection was canceled, either return to the previous session
+            or exit Lernid"""
+
+        if self.firstrun == True:
+            # No previous connection, exiting the application
+            self.destroy()
+        else:
+            # return to the previous session
+            # hide the connection selector and show the session thing
+            self.alignment_connect.hide()
+            self.alignment_loaded.show()
+
     def connect_dialog(self, widget):
-        """Show the connect dialog and connect to the resources."""
-        
-        connectdialog = ConnectDialog.NewConnectDialog()
-        result = connectdialog.run()
-        
-        if result == gtk.RESPONSE_OK:
-            logging.debug("ok")
-            self.nick = connectdialog.builder.get_object("nick_textentry").get_text()
-            self.event = connectdialog.builder.get_object("event_combo").get_active_text()
+        """Show the connection selector once again"""
+        self.alignment_connect.show()
+        self.alignment_loaded.hide()
+
+    def connect_ok(self, widget):
+        """Create a new selection"""
+
+        nick = self.builder.get_object("nick_textentry").get_text()
+        if nick is not None and nick is not "":        
+            # a nickname was provided, so we can continue
+            self.nick = nick
+            self.event = self.builder.get_object("event_combo").get_active_text()
             self.connect_to_resources()
-        else:
-            self.destroy()
+
+            # we now have had a first run
+            self.firstrun = False
+
+            # hide the connection selector and show the session thing
+            self.alignment_connect.hide()
+            self.alignment_loaded.show()
 
     def setup_notifications(self):
         """Set up notification settings."""
@@ -465,6 +522,9 @@
         context_id = self.statusbar.get_context_id('event')
         self.statusbar.push(context_id, _('Connected to ') + self.event)
         self.send_notification(_("Connected to ") + self.event)
+
+        # set the disconnect menu item to sensitive
+        self.builder.get_object("menu_disconnect").set_sensitive(True)
         
         config = ConfigParser.ConfigParser()
         config.read(os.path.join(self.lernidcachefolder_events, "config.lernid"))
@@ -475,7 +535,7 @@
 
         urllib.urlretrieve(config.get(self.event, "icalurl"), os.path.join(self.lernidcachefolder_events, "schedule.ical"))
         
-        self.irc = IrcBackend.Irc()
+        # Connect to the classroom IRC channel
         self.irc.tp_connect("lernid_" + self.nick, "irc.freenode.net", config.get(self.event, "classroom"))
         
         self.browser.show()
@@ -491,6 +551,10 @@
         """Disconnect from the currently selected event."""
 
         logging.debug("Disconnecting from %s" % self.event)
+
+        # set the disconnect menu item to insensitive
+        self.builder.get_object("menu_disconnect").set_sensitive(False)
+        
         self.irc.disconnect()
         
         self.send_notification(_("Disconnecting from ") + self.event)
@@ -594,13 +658,20 @@
 
     def quit(self, widget, data=None):
         """quit - signal handler for closing the LernidWindow"""
+        # properly disconnect from IRC first
         self.irc.disconnect()
+
+        # now end the GTK+ MainLoop
         gtk.main_quit()
 
     def on_destroy(self, widget, data=None):
-        """on_destroy - called when the LernidWindow is close. """
+        """on_destroy - called when the LernidWindow is closed """
         #clean up code for saving application state should be added here
+
+        # properly disconnect from IRC first
         self.irc.disconnect()
+
+        # now end the GTK+ MainLoop
         gtk.main_quit()
     
     def toggle_fullscreen(self, menuitem):
@@ -653,4 +724,3 @@
     window.show()
     gtk.main()
     
-

=== removed file 'data/ui/ConnectDialog.ui'
--- data/ui/ConnectDialog.ui	2009-12-23 13:29:26 +0000
+++ data/ui/ConnectDialog.ui	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-requires connect_dialog 1.0 -->
-  <!-- interface-naming-policy project-wide -->
-  <object class="ConnectDialog" id="connect_dialog">
-    <property name="border_width">6</property>
-    <property name="title" translatable="yes">Choose an event</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon">../media/icon.png</property>
-    <property name="type_hint">normal</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <signal name="close" handler="cancel"/>
-    <signal name="delete_event" handler="cancel"/>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="border_width">6</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="pixbuf">logo.png</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkTable" id="table1">
-                <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">3</property>
-                    <property name="ypad">3</property>
-                    <property name="label" translatable="yes">Event:</property>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">3</property>
-                    <property name="ypad">3</property>
-                    <property name="label" translatable="yes">Nickname:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="event_combo">
-                    <property name="visible">True</property>
-                    <signal name="changed" handler="check_ready_to_connect"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="nick_textentry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                    <property name="activates_default">True</property>
-                    <signal name="changed" handler="check_ready_to_connect"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="cancel"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_connect">
-                <property name="label">gtk-connect</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="ok"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-6">button_cancel</action-widget>
-      <action-widget response="-5">button_connect</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkListStore" id="liststore1"/>
-</interface>

=== modified file 'data/ui/LernidWindow.ui'
--- data/ui/LernidWindow.ui	2009-12-24 01:34:45 +0000
+++ data/ui/LernidWindow.ui	2009-12-24 15:49:12 +0000
@@ -42,6 +42,7 @@
                       <object class="GtkImageMenuItem" id="menu_disconnect">
                         <property name="label">gtk-disconnect</property>
                         <property name="visible">True</property>
+                        <property name="sensitive">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="disconnect_from_resources"/>
@@ -123,8 +124,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment1">
-            <property name="visible">True</property>
+          <object class="GtkAlignment" id="alignment_loaded">
             <property name="top_padding">6</property>
             <property name="bottom_padding">6</property>
             <property name="left_padding">6</property>
@@ -448,6 +448,151 @@
           </packing>
         </child>
         <child>
+          <object class="GtkAlignment" id="alignment_connect">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkVBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkImage" id="image3">
+                        <property name="pixbuf">logo.png</property>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="table1">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <object class="GtkLabel" id="label1">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">3</property>
+                            <property name="ypad">3</property>
+                            <property name="label" translatable="yes">Event:</property>
+                          </object>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label2">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">3</property>
+                            <property name="ypad">3</property>
+                            <property name="label" translatable="yes">Nickname:</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkComboBox" id="event_combo">
+                            <property name="visible">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="nick_textentry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="invisible_char">&#x25CF;</property>
+                            <property name="activates_default">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHButtonBox" id="hbuttonbox1">
+                    <property name="visible">True</property>
+                    <property name="layout_style">center</property>
+                    <child>
+                      <object class="GtkButton" id="button_cancel">
+                        <property name="label">gtk-cancel</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="clicked" handler="connect_cancel"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button_connect">
+                        <property name="label">gtk-connect</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
+                        <property name="has_default">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="clicked" handler="connect_ok"/>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
             <property name="spacing">2</property>

=== removed file 'data/ui/connect_dialog.xml'
--- data/ui/connect_dialog.xml	2009-11-25 03:46:57 +0000
+++ data/ui/connect_dialog.xml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<glade-catalog name="connect_dialog" domain="glade-3" 
-               depends="gtk+" version="1.0">
-  <glade-widget-classes>
-    <glade-widget-class title="sentence_name Dialog" name="ConnectDialog" 
-                        generic-name="connect_dialog" parent="GtkDialog"
-                        icon-name="widget-gtk-dialog"/>
-  </glade-widget-classes>
-
-</glade-catalog>

=== removed file 'lernid/ConnectDialog.py'
--- lernid/ConnectDialog.py	2009-12-23 20:25:36 +0000
+++ lernid/ConnectDialog.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-# -*- coding: utf-8 -*-
-### BEGIN LICENSE
-# Copyright (C) 2009 <Jono Bacon> <[e-mail]>
-#This program is free software: you can redistribute it and/or modify it 
-#under the terms of the GNU General Public License version 3, as published 
-#by the Free Software Foundation.
-#
-#This program is distributed in the hope that it will be useful, but 
-#WITHOUT ANY WARRANTY; without even the implied warranties of 
-#MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-#PURPOSE.  See the GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License along 
-#with this program.  If not, see <http://www.gnu.org/licenses/>.
-### END LICENSE
-
-import os
-import gtk
-import ConfigParser
-import gobject
-import urllib
-import xdg.BaseDirectory
-import logging
-
-from lernid.lernidconfig import getdatapath, save_cache_path
-
-class ConnectDialog(gtk.Dialog):
-    __gtype_name__ = "ConnectDialog"
-
-    def __init__(self):
-        """__init__ - This function is typically not called directly.
-        Creation of a ConnectDialog requires redeading the associated ui
-        file and parsing the ui definition extrenally, 
-        and then calling ConnectDialog.finish_initializing().
-    
-        Use the convenience function NewConnectDialog to create 
-        a ConnectDialog object.
-    
-        """
-        pass
-
-    def finish_initializing(self, builder):
-        """finish_initalizing should be called after parsing the ui definition
-        and creating a ConnectDialog object with it in order to finish
-        initializing the start of the new ConnectDialog instance.
-    
-        """
-        #get a reference to the builder and set up the signals
-        self.builder = builder
-        self.builder.connect_signals(self)
-        
-        # create config folder
-        self.lernidcachefolder = save_cache_path('lernid')
-        self.lerniddatafolder = xdg.BaseDirectory.save_data_path('lernid')
-        self.lernidcachefolder_events = os.path.join(self.lernidcachefolder, "events")
-
-        try:
-            os.mkdir(self.lernidcachefolder_events)
-        except:
-            pass        
-
-        # download event data
-                    
-        config = ConfigParser.ConfigParser()
-        
-        urllib.urlretrieve('http://www.jonobacon.org/files/lernid/ubuntu.lernid', os.path.join(self.lernidcachefolder_events, "config.lernid"))
-        #output = open(os.path.join(self.lernidcachefolder_events, "temp.txt"),'wb')
-        
-        #output.write(response.read())
-        #output.close
-
-        # copy file
-        
-        #shutil.copy(os.path.join(self.lernidcachefolder_events, "temp.txt"),os.path.join(self.lernidcachefolder_events, "ubuntu.txt"))
-
-        # read file
-        
-        config.read(os.path.join(self.lernidcachefolder_events, "config.lernid"))
-
-        sections = config.sections()
-        logging.debug(sections)
-        
-        store = gtk.ListStore(gobject.TYPE_STRING)
-        
-        logging.debug("sections")
-        for s in sections:
-            logging.debug(s)
-            store.append([s])
-
-        self.event_combo = self.builder.get_object("event_combo")
-
-        self.event_combo.set_model(store)
-        cell = gtk.CellRendererText()
-        self.event_combo.pack_start(cell, True)
-        self.event_combo.add_attribute(cell, 'text',0)
-        self.event_combo.set_active(0)
-
-    def ok(self, widget, data=None):
-        """ok - The user has elected to save the changes.
-        Called before the dialog returns gtk.RESONSE_OK from run().
-
-        """
-
-        self.destroy()
-
-    def cancel(self, widget, data=None):
-        """cancel - The user has elected cancel changes.
-        Called before the dialog returns gtk.RESPONSE_CANCEL for run()
-
-        """         
-        self.destroy()
-
-    def check_ready_to_connect(self, widget):
-        event_combo = self.builder.get_object("event_combo")
-        nick_textentry = self.builder.get_object("nick_textentry")
-        if (nick_textentry.get_text() != "") and (event_combo.get_active() != -1) :
-            self.builder.get_object("button_connect").set_sensitive(True)
-        else:
-            self.builder.get_object("button_connect").set_sensitive(False)
-
-def NewConnectDialog():
-    """NewConnectDialog - returns a fully instantiated
-    dialog-camel_case_nameDialog object. Use this function rather than
-    creating ConnectDialog instance directly.
-    
-    """
-
-    #look for the ui file that describes the ui
-    ui_filename = os.path.join(getdatapath(), 'ui', 'ConnectDialog.ui')
-    if not os.path.exists(ui_filename):
-        ui_filename = None
-
-    builder = gtk.Builder()
-    builder.add_from_file(ui_filename)    
-    dialog = builder.get_object("connect_dialog")
-    dialog.finish_initializing(builder)
-    return dialog
-
-if __name__ == "__main__":
-    dialog = NewConnectDialog()
-    dialog.show()
-    gtk.main()
-

=== modified file 'lernid/IrcBackend.py'
--- lernid/IrcBackend.py	2009-12-23 20:57:03 +0000
+++ lernid/IrcBackend.py	2009-12-24 15:49:12 +0000
@@ -127,6 +127,7 @@
         reg = telepathy.client.ManagerRegistry()
         reg.LoadManagers()
 
+        self.conn = None
         self.cm = reg.GetManager('idle') # IRC
         self.room = None
 
@@ -146,7 +147,8 @@
         self.conn.room = self.room
 
     def disconnect(self):
-        self.conn.disconnect()
+        if self.conn is not None:
+            self.conn.disconnect()
 
     def error(self, *args):
         logging.debug("ERROR", self, args)