X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps-dialogs.c;h=7a4f73754cafd82090a0e1a80ff829d0ffa204d1;hb=c2192722c30e86449a7598eb9c962af39ed2a7e0;hp=046beac60daeaa2857a77d4a611ba0cc8a256c73;hpb=5493854dff828914aeb6d60b8fe10ac170820737;p=xfce4-hdaps.git

diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c
index 046beac..7a4f737 100644
--- a/panel-plugin/xfce4-hdaps-dialogs.c
+++ b/panel-plugin/xfce4-hdaps-dialogs.c
@@ -1,31 +1,34 @@
 /*
  * xfce4-hdaps, an XFCE4 panel plugin for the HDAPS system.
  *
- * Copyright Michael Orlitzky
+ * Copyright (C) 2019 Michael Orlitzky
  *
- * http://michael.orlitzky.com/
+ *   http://michael.orlitzky.com/
  *
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details:
+ *
+ *   https://www.gnu.org/licenses/agpl-3.0.html
  *
- * http://www.fsf.org/licensing/licenses/gpl.html
  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include "xfce4-hdaps-dialogs.h"
+#include "hdaps.h"
 
 /* Wild guess. Actually borrowed from some code
    I copy-and-pasted. Doesn't seem too ugly. */
@@ -34,7 +37,7 @@
 /* If people can't read the README, well maybe
  *  they can do it /online/.
  */
-#define PLUGIN_WEBSITE "http://michael.orlitzky.com/code/xfce4-hdaps.php"
+#define PLUGIN_WEBSITE "http://michael.orlitzky.com/code/xfce4-hdaps.xhtml"
 
 
 static void hdaps_configure_response(GtkWidget   *dialog,
@@ -186,35 +189,53 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
 
 
+
+/* URL handler used on the About dialog. */
+static void hdaps_url_handler(GtkAboutDialog *about,
+			      const gchar *link,
+			      gpointer data) {
+    gchar *cmd;
+
+    cmd = g_strdup_printf("%s %s","xdg-open", link);
+
+    /* Stolen from xfce4-power-manager. */
+    if (!g_spawn_command_line_async(cmd, NULL)) {
+      g_free(cmd);
+      cmd = g_strdup_printf("%s %s","xfbrowser4", link);
+      g_spawn_command_line_async(cmd, NULL);
+    }
+    g_free(cmd);
+}
+
+
+/* Email address handler used on the About dialog. */
+static void hdaps_mailto_handler(GtkAboutDialog *about,
+				 const gchar *link,
+				 gpointer data) {
+    gchar *cmd = g_strdup_printf( "%s %s", "xdg-email", link);
+
+    g_spawn_command_line_async(cmd, NULL);
+    g_free(cmd);
+}
+
+
 void hdaps_about(XfcePanelPlugin *plugin) {
-  GdkPixbuf *icon;
-  GtkWidget *dialog;
-  XfceAboutInfo *about;
-
-  /* Send NULL as our license, since GPL >= 3 is not
-     supported yet. I don't particularly care if people
-     want to re-license under GPL2, but I also don't want
-     to cause any unnecessary confusion. */
-  about = xfce_about_info_new("xfce4-hdaps",
-			      VERSION,
-			      _("An HDAPS Plugin for XFCE4"),
-			      XFCE_COPYRIGHT_TEXT("2009", "Michael Orlitzky"),
-			      NULL);
-  
-  xfce_about_info_set_homepage(about, PLUGIN_WEBSITE);
-  
-  xfce_about_info_add_credit(about,
-			     "Michael Orlitzky",
-			     "michael@orlitzky.com",
-			     _("A Reasonable Man"));
-
-  icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-				  "xfce4-hdaps",
-				  48, 0, NULL);
-  
-  dialog = xfce_about_dialog_new_with_values(NULL, about, icon);
-  xfce_about_info_free(about);
-  gtk_dialog_run(GTK_DIALOG(dialog));
-  gtk_widget_destroy(dialog);
-  g_object_unref(G_OBJECT(icon));
+  const gchar *authors[] = { "Michael Orlitzky <michael@orlitzky.com>", NULL };
+  const gchar *copyright = "Copyright \302\251 2012 Michael Orlitzky";
+
+  gtk_about_dialog_set_url_hook(hdaps_url_handler, NULL, NULL);
+  gtk_about_dialog_set_email_hook(hdaps_mailto_handler, NULL, NULL);
+
+  gtk_show_about_dialog(NULL,
+			"authors", authors,
+			"copyright", copyright,
+			"destroy-with-parent", TRUE,
+			"license", LICENSE_AGPL3,
+			"logo-icon-name", PACKAGE_NAME,
+			"icon-name", PACKAGE_NAME,
+			"program-name", PACKAGE_NAME,
+			"version", PACKAGE_VERSION,
+			"website", PLUGIN_WEBSITE,
+			"website-label", "xfce4-hdaps homepage",
+			NULL);
 }