X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=e5a781e3b7cd50915f5a7136caeee63ad13d0c79;hb=c6fbeea01e8de4fedf99ea8f533991277d2c8eb7;hp=732224c4e5dfe7e65ead2845e38eab56b8c11c82;hpb=f7f9ab86d0ca87edbd50125198093fc5f44127ab;p=xfce4-hdaps.git

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 732224c..e5a781e 100644
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.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
@@ -130,15 +131,14 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) {
 
 
 void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) {
-    
   if (status == HDAPS_ERROR) {
-    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Error", NULL);
+    gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Error");
   }
   else if (status == HDAPS_OFF) {
-    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Off", NULL);
+    gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Off");
   }
   else {
-    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS On", NULL);
+    gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS On");
   }
 }
 
@@ -252,11 +252,11 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
   /* Make the event box transparent. In newer versions of xfce4-panel
      users can make the panel transparent, so we don't want to stick a
      big opaque box on it. */
-  gtk_event_box_set_visible_window(hdaps->eventbox, FALSE);
+  gtk_event_box_set_visible_window(GTK_EVENT_BOX(hdaps->eventbox), FALSE);
 
   /* Set up the hvbox for the widget, which supports
      both horizontal and vertical (hv) orientations. */
-  hdaps->hvbox = xfce_hvbox_new(orientation, FALSE, 2);
+  hdaps->hvbox = gtk_box_new(orientation, 2);
   gtk_widget_show(hdaps->hvbox);
   gtk_container_add(GTK_CONTAINER(hdaps->eventbox), hdaps->hvbox);
 
@@ -264,14 +264,6 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
      so it's important that they start out n*sync. */
   hdaps->previous_status = HDAPS_OFF;
   hdaps_set_icon(hdaps, HDAPS_OFF);
-
-  /* Create the tooltip widget, and set its initial value.
-   * The first couple of lines are stolen from the battery
-   * status plugin. I make no claim as to their correctness.
-   */
-  hdaps->tooltip = gtk_tooltips_new();
-  g_object_ref(G_OBJECT(hdaps->tooltip));
-  gtk_object_sink(GTK_OBJECT(hdaps->tooltip));
   hdaps_set_tooltip(hdaps, HDAPS_OFF);
   
   return hdaps;
@@ -307,10 +299,6 @@ static void hdaps_free(XfcePanelPlugin *plugin,
     g_free(hdaps->device_name);
   }
 
-  /* Goodbye, tooltips. */
-  gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, NULL, NULL);
-  g_object_unref(G_OBJECT(hdaps->tooltip));
-  
   /* ...and finally free the plugin structure. */
   panel_slice_free(HdapsPlugin, hdaps);
 }
@@ -322,7 +310,7 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin,
 				      HdapsPlugin     *hdaps) {
   
   /* Change the plugin's orientation. Basically magic to me. */
-  xfce_hvbox_set_orientation(XFCE_HVBOX(hdaps->hvbox), orientation);
+  gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation);
 }
 
 
@@ -345,6 +333,9 @@ static gboolean hdaps_size_changed(XfcePanelPlugin *plugin,
     gtk_widget_set_size_request(GTK_WIDGET(plugin), size, -1);
   }
 
+  /* This fixes an issue where the initial icon size is too small. */
+  hdaps_set_icon(hdaps, hdaps->previous_status);
+
   /* We handled the change, so we're supposed to return TRUE. */
   return TRUE;
 }