panel-plugin: replace XFCE_HVBOX with new GtkBox API.

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

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 95f05eb5f90a14b014b94f6db7d496da45a84e07..e5a781e3b7cd50915f5a7136caeee63ad13d0c79 100644 (file)
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -131,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");
   }
 }
 
@@ -257,7 +256,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
 
   /* 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);
 
@@ -265,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;
@@ -308,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);
 }
@@ -323,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);
 }