[gthumb] picasa web importer: fixed account list

[Paolo Bacchilega <paobac src gnome org>]

commit 3ce7c6a97312ab5b2649f44abe941d090c9f83e5
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Dec 16 20:22:20 2012 +0100

    picasa web importer: fixed account list

 .../picasaweb/data/ui/import-from-picasaweb.ui     |   18 ++++--------------
 extensions/picasaweb/dlg-import-from-picasaweb.c   |    4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/extensions/picasaweb/data/ui/import-from-picasaweb.ui b/extensions/picasaweb/data/ui/import-from-picasaweb.ui
index f0078c9..c0bf607 100644
--- a/extensions/picasaweb/data/ui/import-from-picasaweb.ui
+++ b/extensions/picasaweb/data/ui/import-from-picasaweb.ui
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="account_liststore">
     <columns>
-      <!-- column-name email -->
-      <column type="gchararray"/>
+      <!-- column-name account -->
+      <column type="GObject"/>
       <!-- column-name name -->
       <column type="gchararray"/>
-      <!-- column-name icon -->
-      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="album_liststore">
@@ -46,11 +44,9 @@
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-help</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -63,11 +59,9 @@
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -79,11 +73,9 @@
             <child>
               <object class="GtkButton" id="download_button">
                 <property name="label" translatable="yes">_Import</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="image">download_image</property>
                 <property name="use_underline">True</property>
               </object>
@@ -151,17 +143,15 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="edit_accounts_button">
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="tooltip_text" translatable="yes">Edit accounts</property>
-                                <property name="use_action_appearance">False</property>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="stock">gtk-edit</property>
+                                    <property name="icon_name">view-list-symbolic</property>
                                   </object>
                                 </child>
                               </object>
diff --git a/extensions/picasaweb/dlg-import-from-picasaweb.c b/extensions/picasaweb/dlg-import-from-picasaweb.c
index 24ded51..84b83ef 100644
--- a/extensions/picasaweb/dlg-import-from-picasaweb.c
+++ b/extensions/picasaweb/dlg-import-from-picasaweb.c
@@ -496,13 +496,13 @@ update_account_list (DialogData *data)
 	for (scan = web_service_get_accounts (WEB_SERVICE (data->service)), idx = 0; scan; scan = scan->next, idx++) {
 		OAuthAccount *account = scan->data;
 
-		if ((current_account != NULL) && (g_strcmp0 (current_account->username, account->username) == 0))
+		if ((current_account != NULL) && (g_strcmp0 (current_account->id, account->id) == 0))
 			current_account_idx = idx;
 
 		gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("account_liststore")), &iter,
 				    ACCOUNT_DATA_COLUMN, account,
-				    ACCOUNT_NAME_COLUMN, account->username,
+				    ACCOUNT_NAME_COLUMN, account->name,
 				    -1);
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx);