~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/configuration.c, lib/home.c: Introduce environment variables.
[disorder]
/
disobedience
/
login.c
diff --git
a/disobedience/login.c
b/disobedience/login.c
index
4031c3a
..
ae5f415
100644
(file)
--- a/
disobedience/login.c
+++ b/
disobedience/login.c
@@
-120,11
+120,13
@@
static void set_service(struct config *c, const char *s) {
}
static void set_username(struct config *c, const char *s) {
}
static void set_username(struct config *c, const char *s) {
- c->username = s;
+ xfree(c->username);
+ c->username = xstrdup(s);
}
static void set_password(struct config *c, const char *s) {
}
static void set_password(struct config *c, const char *s) {
- c->password = s;
+ xfree(c->password);
+ c->password = xstrdup(s);
}
/** @brief Table used to generate the form */
}
/** @brief Table used to generate the form */
@@
-154,7
+156,7
@@
static void login_update_config(struct config *c) {
/** @brief Save current login details */
static void login_save_config(void) {
/** @brief Save current login details */
static void login_save_config(void) {
- char *path = config_userconf(
0, 0
), *tmp;
+ char *path = config_userconf(), *tmp;
FILE *fp;
byte_xasprintf(&tmp, "%s.tmp", path);
FILE *fp;
byte_xasprintf(&tmp, "%s.tmp", path);
@@
-230,6
+232,12
@@
static void login_cancel(GtkButton attribute((unused)) *button,
gtk_widget_destroy(login_window);
}
gtk_widget_destroy(login_window);
}
+/** @brief User pressed cancel in the login window */
+static void login_help(GtkButton attribute((unused)) *button,
+ gpointer attribute((unused)) userdata) {
+ popup_help("intro.html#login");
+}
+
/** @brief Keypress handler */
static gboolean login_keypress(GtkWidget attribute((unused)) *widget,
GdkEventKey *event,
/** @brief Keypress handler */
static gboolean login_keypress(GtkWidget attribute((unused)) *widget,
GdkEventKey *event,
@@
-251,18
+259,25
@@
static gboolean login_keypress(GtkWidget attribute((unused)) *widget,
/* Buttons that appear at the bottom of the window */
static struct button buttons[] = {
{
/* Buttons that appear at the bottom of the window */
static struct button buttons[] = {
{
-
"Login"
,
- login_
ok
,
- "
(Re-)connect using these settings
",
+
GTK_STOCK_HELP
,
+ login_
help
,
+ "
Go to manual
",
0,
0,
-
NULL
,
+
gtk_box_pack_start
,
},
{
GTK_STOCK_CLOSE,
login_cancel,
"Discard changes and close window",
0,
},
{
GTK_STOCK_CLOSE,
login_cancel,
"Discard changes and close window",
0,
- NULL,
+ gtk_box_pack_end,
+ },
+ {
+ "Login",
+ login_ok,
+ "(Re-)connect using these settings",
+ 0,
+ gtk_box_pack_end,
},
};
},
};