X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=config%2Fdolconf.c;h=a63790936a6f1b654e0a44d54fd1fe16ec9ae885;hb=289fa2eafbef8f308b021f5e49ad73f9af7bdad5;hp=6edc9a6bb7681fad8987057f342585c262337b70;hpb=80625aa9ccbc4bd21eacc65e0020fdd1b3f052cb;p=doldaconnect.git

diff --git a/config/dolconf.c b/config/dolconf.c
index 6edc9a6..a637909 100644
--- a/config/dolconf.c
+++ b/config/dolconf.c
@@ -31,6 +31,8 @@
 #include <pwd.h>
 #include <stdarg.h>
 #include <arpa/inet.h>
+#include <doldaconnect/uilib.h>
+#include <doldaconnect/uimisc.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -69,6 +71,7 @@ void cb_cfw_orport_toggled(GtkWidget *widget, gpointer uudata);
 void cb_cfw_oraddr_toggled(GtkWidget *widget, gpointer uudata);
 void cb_cfw_uinet_toggled(GtkWidget *widget, gpointer uudata);
 void cb_cfw_save_activate(GtkWidget *widget, gpointer uudata);
+void cb_cfw_hup_activate(GtkWidget *widget, gpointer uudata);
 void cb_cfw_quit_activate(GtkWidget *widget, gpointer uudata);
 void cb_cfw_shareadd_clicked(GtkWidget *widget, gpointer uudata);
 void cb_cfw_sharerem_clicked(GtkWidget *widget, gpointer uudata);
@@ -716,6 +719,29 @@ void cb_cfw_uinet_toggled(GtkWidget *widget, gpointer uudata)
     gtk_widget_set_sensitive(GTK_WIDGET(cfw_uibox), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
 }
 
+void cb_cfw_hup_activate(GtkWidget *widget, gpointer uudata)
+{
+    int tag;
+    struct dc_response *resp;
+    
+    if(dc_connectsync2(dc_srv_local, DC_LATEST) < 0) {
+	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server"));
+	return;
+    }
+    if(dc_login(NULL, 1, dc_convnone, NULL) != DC_LOGIN_ERR_SUCCESS) {
+	dc_disconnect();
+	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server"));
+	return;
+    }
+    tag = dc_queuecmd(NULL, NULL, L"hup", NULL);
+    if((resp = dc_gettaggedrespsync(tag)) != NULL) {
+	if(resp->code != 200)
+	    msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server"));
+	dc_freeresp(resp);
+    }
+    dc_disconnect();
+}
+
 void cb_cfw_save_activate(GtkWidget *widget, gpointer uudata)
 {
     struct cfvar *cv;
@@ -732,7 +758,7 @@ void cb_cfw_quit_activate(GtkWidget *widget, gpointer uudata)
 {
     cfw2conf();
     if(dirty) {
-	if(msgbox(GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("There are unsaved settings. Do you wish to discard the changes and exit anyway?")) == GTK_RESPONSE_NO)
+	if(msgbox(GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("There are unsaved changes. Do you wish to discard the changes and exit anyway?")) == GTK_RESPONSE_NO)
 	    return;
     }
     gtk_main_quit();
@@ -748,6 +774,7 @@ int main(int argc, char **argv)
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
     prepstatic();
+    dc_init();
     
     gtk_init(&argc, &argv);
     state = -1;
@@ -760,9 +787,14 @@ int main(int argc, char **argv)
 	    state = 0;
 	    break;
 	case 'h':
+	    printf("usage: dolconf [-haw]\n");
+	    printf("\t-h\tDisplay this help message\n");
+	    printf("\t-a\tGo directly to the assistant\n");
+	    printf("\t-w\tGo directly to the standard window\n");
+	    exit(0);
 	default:
-	    fprintf((c == 'h')?stdout:stderr, "usage: dolconf [-haw]\n");
-	    exit((c == 'h')?0:1);
+	    fprintf(stderr, "usage: dolconf [-haw]\n");
+	    exit(1);
 	}
     }