X-Git-Url: http://git.maemo.org/git/?p=sharing-cli;a=blobdiff_plain;f=src%2Fplugin.c;h=fdd20472d4c03f885971a935218529d101eae7a8;hp=5e2f5f797a364984b20655eed65fe8081f6ff7dc;hb=51f94376be27d8d919190d4cd4489833877cee7d;hpb=fa8cee8e51b9e1fd95f8571cd2fee1f2d49c84bb

diff --git a/src/plugin.c b/src/plugin.c
index 5e2f5f7..fdd2047 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -275,7 +275,10 @@ gui_read_item (GHashTable* h, const gchar* id, SharingAccount* a)
 	  sharing_account_set_param (a, id, new);
 	  changed = TRUE;
 	}
-  
+  /* Make the account name shown under service name */
+  if (changed && id == "name") {
+	  sharing_account_set_username(a, new);
+  }
   g_free (old);
   return changed;
 }
@@ -283,11 +286,13 @@ gui_read_item (GHashTable* h, const gchar* id, SharingAccount* a)
 static gboolean
 gui_read(GHashTable* h, SharingAccount* a)
 {
-  gboolean changed = FALSE;
-
-  if (gui_read_item (h, "command_line", a)) changed = TRUE;
-
-  return changed;
+  gboolean command_updated = FALSE;
+  gboolean name_updated = FALSE;
+  command_updated = gui_read_item (h, "command_line", a);
+  name_updated = gui_read_item (h, "name", a);
+  /* Must separate the evaluation of two gui_read_item, or 1 of 2 params
+   * won't be saved */
+  return command_updated || name_updated;
 }
 
 
@@ -338,9 +343,13 @@ edit_account(SharingAccount* account, GtkWindow* parent, gboolean setup)
 
   gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0);
   
-  gui_add_item(table, 0,
+  gui_add_item(table, 1,
 			   "command_line", "CLI command",
-			   "Command line command to execute",
+			   "Command to execute",
+			   FALSE, account, h);
+  gui_add_item(table, 0,
+			   "name", "Name",
+			   "Account name",
 			   FALSE, account, h);
   
   gtk_widget_show_all (GTK_WIDGET (dlg));
@@ -352,6 +361,7 @@ edit_account(SharingAccount* account, GtkWindow* parent, gboolean setup)
   
   gtk_widget_destroy (dlg);
   g_hash_table_unref (h);
+  g_hash_table_unref (h);
   
   if (result == GTK_RESPONSE_YES && (changed || setup))
 	return SHARING_EDIT_ACCOUNT_SUCCESS;