xfce4-hdaps-dialogs.c: replace obsolete gtk_misc_set_alignment().

[xfce4-hdaps.git] / panel-plugin / xfce4-hdaps-dialogs.c

diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c
index d03a6a7a482f10956bcc67059d47f1d5d22f4ff7..dc104fdff75f67329b4d84747e93d99fc4e8fe73 100644 (file)
--- a/panel-plugin/xfce4-hdaps-dialogs.c
+++ b/panel-plugin/xfce4-hdaps-dialogs.c
@@ -1,21 +1,22 @@
 /*
  * 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
@@ -36,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,
@@ -61,7 +62,7 @@ static void hdaps_configure_response(GtkWidget   *dialog,
        want to save any settings that may have changed. */
     g_object_set_data(G_OBJECT(hdaps->plugin), "dialog", NULL);
     hdaps->poll_frequency = gtk_spin_button_get_value_as_int((GtkSpinButton*)hdaps->sb_poll_frequency);
-    hdaps->device_name = gtk_combo_box_get_active_text((GtkComboBox*)hdaps->cb_device_name);
+    hdaps->device_name = gtk_combo_box_text_get_active_text((GtkComboBoxText*)hdaps->cb_device_name);
     snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
     hdaps_save(hdaps->plugin, hdaps);
     hdaps_reset_timeout(hdaps);
@@ -100,7 +101,7 @@ void hdaps_configure(XfcePanelPlugin *plugin,
   /* Create the dialog */
   dialog = xfce_titled_dialog_new_with_buttons(_("Hdaps Plugin"),
                                               GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                                              GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                              GTK_DIALOG_DESTROY_WITH_PARENT,
                                               GTK_STOCK_HELP, GTK_RESPONSE_HELP,
                                               GTK_STOCK_SAVE, GTK_RESPONSE_OK,
                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -133,7 +134,8 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Poll Frequency:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
   hdaps->sb_poll_frequency = gtk_spin_button_new_with_range(100, 5000, 100);
@@ -151,14 +153,15 @@ void hdaps_configure(XfcePanelPlugin *plugin,
 
   label = gtk_label_new(_("Device Name:"));
   gtk_size_group_add_widget(sg, label);
-  gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+  gtk_widget_set_halign(label, 0.0);
+  gtk_widget_set_valign(label, 0.5);
   gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
-  hdaps->cb_device_name = gtk_combo_box_new_text();
+  hdaps->cb_device_name = gtk_combo_box_text_new();
 
   /* Add the current device name, it should always be available.
      Oh, and it should be the default, too. */
-  gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps->device_name);
+  gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps->device_name);
   
   /* This function takes an index, and 0 should be the first
      (only) index at this point. */
@@ -176,7 +179,7 @@ void hdaps_configure(XfcePanelPlugin *plugin,
        the only entry. Therefore, to avoid duplicates, we only
        have to avoid adding the current device name a second time. */
     if (strcmp(hdaps_devices[list_idx], hdaps->device_name) != 0) {
-      gtk_combo_box_append_text((GtkComboBox*)hdaps->cb_device_name, hdaps_devices[list_idx]);
+      gtk_combo_box_text_append_text((GtkComboBoxText*)hdaps->cb_device_name, hdaps_devices[list_idx]);
     }
   }
   
@@ -220,7 +223,7 @@ static void hdaps_mailto_handler(GtkAboutDialog *about,
 
 void hdaps_about(XfcePanelPlugin *plugin) {
   const gchar *authors[] = { "Michael Orlitzky <michael@orlitzky.com>", NULL };
-  const gchar *copyright = "Copyright \302\251 2011 Michael Orlitzky";
+  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);
@@ -229,10 +232,10 @@ void hdaps_about(XfcePanelPlugin *plugin) {
                        "authors", authors,
                        "copyright", copyright,
                        "destroy-with-parent", TRUE,
-                       "license", LICENSE_GPL3,
+                       "license", LICENSE_AGPL3,
                        "logo-icon-name", PACKAGE_NAME,
                        "icon-name", PACKAGE_NAME,
-                       "name", PACKAGE_NAME,
+                       "program-name", PACKAGE_NAME,
                        "version", PACKAGE_VERSION,
                        "website", PLUGIN_WEBSITE,
                        "website-label", "xfce4-hdaps homepage",