@@ -713,14 +713,15 @@
             self.connect("scroll_event", self.no_scroll)
 
         # collect entries
         self.ls = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
         self.set_model(self.ls)
-        entries = entries.items()
-        if type(entries[0]) is not tuple:
-            entries = zip(entries, entries)
-        for key,value in entries:
+        if isinstance(entries, str):
+            entries = ComboBoxText.parse_options(entries)
+        if isinstance(entries, list):
+            entries = dict(zip(entries, entries))
+        for key,value in entries.items():
             self.ls.append([key, value])
         
     # activate dropdown of given value
     def set_default(self, value):
         for index,row in enumerate(self.ls):