Help button for login box. With free nasty hack for Macs.

diff --git a/disobedience/help.c b/disobedience/help.c
index 5b708e8a2076b02dd7d77ff231b68077d4d61cc6..ca5a8d8d90af85f3925c4be5e12520562b73fff6 100644 (file)
--- a/disobedience/help.c
+++ b/disobedience/help.c
@@ -31,7 +31,16 @@ void popup_help(const char *what) {
 
   if(!what)
     what = "index.html";
-  byte_xasprintf(&path, "%s/%s", dochtmldir, what);
+#if __APPLE__
+  if(!strcmp(browser, "open"))
+    /* Apple's open(1) isn't really a web browser so needs some extra hints
+     * that it should see the argument as a URL.  Otherwise it doesn't treat #
+     * specially.  A better answer would be to identify the system web browser
+     * and invoke it directly. */
+    byte_xasprintf(&path, "file:///%s/%s", dochtmldir, what);
+  else
+#endif
+    byte_xasprintf(&path, "%s/%s", dochtmldir, what);
   if(!(pid = xfork())) {
     exitfn = _exit;
     if(!xfork()) {

diff --git a/disobedience/login.c b/disobedience/login.c
index 4031c3a654759e2cd683382e166e978a1df8cc0a..a02c1c6e698188013c2a5e80051a5083ab8d92ed 100644 (file)
--- a/disobedience/login.c
+++ b/disobedience/login.c
@@ -230,6 +230,12 @@ static void login_cancel(GtkButton attribute((unused)) *button,
   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,
@@ -251,18 +257,25 @@ static gboolean login_keypress(GtkWidget attribute((unused)) *widget,
 /* 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,
-    NULL,
+    gtk_box_pack_start,
   },
   {
     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,
   },
 };