User deletion in Disobedience

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 81905656a974f75553aeee41f20b6fc92d484304..f01d7fc43bb141f39edd63b0ac62c9dbd8d48f39 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -75,6 +75,7 @@ struct callbackdata {
     struct choosenode *choosenode;      /* gtkchoose.c got_files/got_dirs */
     struct queuelike *ql;               /* gtkqueue.c queuelike_completed */
     struct prefdata *f;                 /* properties.c */
     struct choosenode *choosenode;      /* gtkchoose.c got_files/got_dirs */
     struct queuelike *ql;               /* gtkqueue.c queuelike_completed */
     struct prefdata *f;                 /* properties.c */

+    const char *user;                   /* users.c */

   } u;
 };
 
   } u;
 };
 

diff --git a/disobedience/users.c b/disobedience/users.c
index a2624601172880ac86727334540e8023afa5328a..172c6379c430cd14cb1e89cdc20105f25dfba28d 100644 (file)
--- a/disobedience/users.c
+++ b/disobedience/users.c
@@ -25,6 +25,7 @@
 
 static GtkWidget *users_window;
 static GtkListStore *users_list;
 
 static GtkWidget *users_window;
 static GtkListStore *users_list;

+static GtkTreeSelection *users_selection;

 
 static int usercmp(const void *a, const void *b) {
   return strcmp(*(char **)a, *(char **)b);
 
 static int usercmp(const void *a, const void *b) {
   return strcmp(*(char **)a, *(char **)b);


@@ -50,8 +51,60 @@ static void users_add(GtkButton attribute((unused)) *button,
                      gpointer attribute((unused)) userdata) {
 }
 
                      gpointer attribute((unused)) userdata) {
 }
 

+static void users_deleted_error(struct callbackdata attribute((unused)) *cbd,
+                               int attribute((unused)) code,
+                               const char *msg) {
+  popup_msg(GTK_MESSAGE_ERROR, msg);
+}
+
+static void users_deleted(void *v) {
+  const struct callbackdata *const cbd = v;
+  GtkTreeIter iter;
+  char *who;
+
+  /* Find the user */
+  if(!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(users_list), &iter))
+    return;
+  do {
+    gtk_tree_model_get(GTK_TREE_MODEL(users_list), &iter,
+                      0, &who, -1);
+    if(!strcmp(who, cbd->u.user))
+      break;
+    g_free(who);
+    who = 0;
+  } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(users_list), &iter));
+  /* Remove them */
+  gtk_list_store_remove(users_list, &iter);
+  g_free(who);
+}
+

 static void users_delete(GtkButton attribute((unused)) *button,
                         gpointer attribute((unused)) userdata) {
 static void users_delete(GtkButton attribute((unused)) *button,
                         gpointer attribute((unused)) userdata) {

+  GtkTreeIter iter;
+  GtkWidget *yesno;
+  char *who;
+  int res;
+  struct callbackdata *cbd;
+
+  if(gtk_tree_selection_get_selected(users_selection, 0, &iter)) {
+    gtk_tree_model_get(GTK_TREE_MODEL(users_list), &iter,
+                      0, &who, -1);
+    yesno = gtk_message_dialog_new(GTK_WINDOW(users_window),
+                                  GTK_DIALOG_MODAL,
+                                  GTK_MESSAGE_QUESTION,
+                                  GTK_BUTTONS_YES_NO,
+                                  "Do you really want to delete user %s?"
+                                  " This action cannot be undone.", who);
+    res = gtk_dialog_run(GTK_DIALOG(yesno));
+    gtk_widget_destroy(yesno);
+    if(res == GTK_RESPONSE_YES) {
+      cbd = xmalloc(sizeof *cbd);
+      cbd->onerror = users_deleted_error;
+      cbd->u.user = xstrdup(who);
+      disorder_eclient_deluser(client, users_deleted, cbd->u.user, cbd);
+    }
+    g_free(who);
+  }

 }
 
 static void users_edit(GtkButton attribute((unused)) *button,
 }
 
 static void users_edit(GtkButton attribute((unused)) *button,


@@ -108,6 +161,9 @@ void manage_users(void) {
                                                 "text", 0,
                                                 NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(tree), col);
                                                 "text", 0,
                                                 NULL);
   gtk_tree_view_append_column(GTK_TREE_VIEW(tree), col);

+  /* Get the selection for the view and set its mode */
+  users_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
+  gtk_tree_selection_set_mode(users_selection, GTK_SELECTION_BROWSE);

   /* Create the control buttons */
   buttons = create_buttons_box(users_buttons,
                               NUSERS_BUTTONS,
   /* Create the control buttons */
   buttons = create_buttons_box(users_buttons,
                               NUSERS_BUTTONS,

diff --git a/lib/eclient.c b/lib/eclient.c
index 70231879990070716a80f774809cbd3f900bb966..80f2dc6322cc710db2a81d1bbfe67f6f185de83d 100644 (file)
--- a/lib/eclient.c
+++ b/lib/eclient.c
@@ -1277,6 +1277,20 @@ int disorder_eclient_users(disorder_eclient *c,
                 "users", (char *)0);
 }
 
                 "users", (char *)0);
 }
 

+/** @brief Delete a user
+ * @param c Client
+ * @param completed Called on completion
+ * @param user User to delete
+ * @param v Passed to @p completed
+ */
+int disorder_eclient_deluser(disorder_eclient *c,
+                             disorder_eclient_no_response *completed,
+                             const char *user,
+                             void *v) {
+  return simple(c, no_response_opcallback, (void (*)())completed, v, 
+                "deluser", user, (char *)0);
+}
+

 /* Log clients ***************************************************************/
 
 /** @brief Monitor the server log
 /* Log clients ***************************************************************/
 
 /** @brief Monitor the server log

diff --git a/lib/eclient.h b/lib/eclient.h
index 176abaf72bd783ea8bebb7f838329b488a73af07..f65f4f5b1fe47bb4a9204cb7a33a820c786dc3e9 100644 (file)
--- a/lib/eclient.h
+++ b/lib/eclient.h
@@ -329,6 +329,10 @@ int disorder_eclient_rtp_address(disorder_eclient *c,
 int disorder_eclient_users(disorder_eclient *c,
                            disorder_eclient_list_response *completed,
                            void *v);
 int disorder_eclient_users(disorder_eclient *c,
                            disorder_eclient_list_response *completed,
                            void *v);

+int disorder_eclient_deluser(disorder_eclient *c,
+                             disorder_eclient_no_response *completed,
+                             const char *user,
+                             void *v);

 
 #endif
 
 
 #endif