--- /usr/bin/Uploadr	2007-05-12 13:31:54.000000000 +1000
+++ Uploadr	2007-09-06 18:12:09.000000000 +1000
@@ -468,6 +468,7 @@
             api.token   : str(self.authorization.token),
             api.perms   : str(self.authorization.perms),
             "title"     : str( FLICKR["title"] ),
+            "description": str( FLICKR["description"] ),
             "tags"      : str( FLICKR["tags"] ),
             "is_public" : str( FLICKR["is_public"] ),
             "is_friend" : str( FLICKR["is_friend"] ),
@@ -500,7 +501,7 @@
                 gtk.DIALOG_MODAL,
                 (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
 
-        table = gtk.Table(4, 2)
+        table = gtk.Table(5, 2)
         table.set_border_width(10)
         table.set_row_spacings(10)
 
@@ -511,31 +512,38 @@
         self.ptitle = gtk.Entry()
         table.attach(self.ptitle, 1, 2, 0, 1)
 
-        label = gtk.Label("Tags: ")
+        label = gtk.Label("Description: ")
         label.set_alignment(1, 0.5)
         table.attach(label, 0, 1, 1, 2)
 
+        self.description = gtk.Entry()
+        table.attach(self.description, 1, 2, 1, 2)
+
+        label = gtk.Label("Tags: ")
+        label.set_alignment(1, 0.5)
+        table.attach(label, 0, 1, 2, 3)
+
         self.tags = gtk.Entry()
-        table.attach(self.tags, 1, 2, 1, 2)
+        table.attach(self.tags, 1, 2, 2, 3)
 
         self.is_private = gtk.CheckButton("The pictures are private")
         if self.config.has_option('settings', 'is_public'):
             self.is_private.set_active(not self.config.getboolean('settings', 'is_public'))
-        table.attach(self.is_private, 1, 2, 2, 3)
+        table.attach(self.is_private, 1, 2, 3, 4)
 
         self.open_flickr = gtk.CheckButton("Open Flickr after upload")
         if self.config.has_option('settings', 'open_flickr'):
             self.open_flickr.set_active(self.config.getboolean('settings', 'open_flickr'))
         else:
             self.open_flickr.set_active(True)
-        table.attach(self.open_flickr, 1, 2, 3, 4)
+        table.attach(self.open_flickr, 1, 2, 4, 5)
 
         self.vbox.pack_start(table, True, True)
         self.show_all()
 
     def run(self):
         response = gtk.Dialog.run(self)
-        info = {"title": self.ptitle.get_text(), "tags": self.tags.get_text(),
+        info = {"title": self.ptitle.get_text(), "description": self.description.get_text(), "tags": self.tags.get_text(),
                 "is_public": self.is_private.get_active() and "0" or "1",
                 "open_flickr": self.open_flickr.get_active() and True or False }
         self.destroy()