X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=ac8b2d7e37191426a285d8d87f16155e60d16ff4;hb=b9ce0d116a61d4c0e000672a6efbc235db709f75;hp=95f05eb5f90a14b014b94f6db7d496da45a84e07;hpb=c2192722c30e86449a7598eb9c962af39ed2a7e0;p=xfce4-hdaps.git

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 95f05eb..ac8b2d7 100644
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -45,7 +45,7 @@ XFCE_PANEL_PLUGIN_REGISTER(hdaps_construct);
 
 
 void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) {
-  
+
   XfceRc *rc;
   gchar  *file;
 
@@ -68,15 +68,15 @@ void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) {
     DBG("Failed to open the configuration file. Bailing.");
     return;
   }
-  
-  
+
+
   /* Write any user-configured values to the resource file. */
   if (hdaps->device_name) {
     xfce_rc_write_entry(rc, "device_name", hdaps->device_name);
   }
-    
+
   xfce_rc_write_int_entry(rc, "poll_frequency", hdaps->poll_frequency);
-    
+
   /* close the rc file */
   xfce_rc_close(rc);
 }
@@ -94,52 +94,56 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) {
   if (status == HDAPS_ERROR) {
     /* Error */
     icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-				    "emblem-noread",
-				    size, 0, NULL);
+                                    "emblem-noread",
+                                    size, 0, NULL);
   }
   else if (status == HDAPS_OFF) {
     icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-				    "drive-harddisk",
-				    size, 0, NULL);
+                                    "drive-harddisk",
+                                    size, 0, NULL);
   }
   else {
     /* status > HDAPS_OFF means it's on. */
     icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-				    "emblem-nowrite",
-				    size, 0, NULL);
+                                    "emblem-nowrite",
+                                    size, 0, NULL);
   }
 
   /* Get rid of the previous icon. */
   if (hdaps->icon) {
     gtk_widget_destroy(hdaps->icon);
   }
-  
+
   if (icon) {
     hdaps->icon = gtk_image_new_from_pixbuf(icon);
     g_object_unref(G_OBJECT(icon));
   }
   else {
-    hdaps->icon = gtk_image_new_from_icon_name("dialog-warning", GTK_ICON_SIZE_BUTTON);
+    hdaps->icon = gtk_image_new_from_icon_name("dialog-warning",
+                                               GTK_ICON_SIZE_BUTTON);
   }
 
-  gtk_box_pack_start(GTK_BOX(hdaps->hvbox), GTK_WIDGET(hdaps->icon), FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(hdaps->hvbox),
+                     GTK_WIDGET(hdaps->icon),
+                     FALSE,
+                     FALSE,
+                     0);
   gtk_widget_show(hdaps->icon);
-  
+
   return;
 }
 
 
 
 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");
   }
 }
 
@@ -163,7 +167,10 @@ static void hdaps_set_defaults(HdapsPlugin *hdaps) {
     hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
   }
 
-  snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
+  snprintf(hdaps->sysfs_file,
+           FILENAME_MAX,
+           UNLOAD_HEADS_FMT,
+           hdaps->device_name);
 
   /* The other default is easier. */
   hdaps->poll_frequency = DEFAULT_POLL_FREQUENCY;
@@ -171,7 +178,7 @@ static void hdaps_set_defaults(HdapsPlugin *hdaps) {
 
 
 static void hdaps_read(HdapsPlugin *hdaps) {
-  
+
   XfceRc      *rc;
   gchar       *file;
   const gchar *saved_device_name;
@@ -184,7 +191,7 @@ static void hdaps_read(HdapsPlugin *hdaps) {
     DBG("Retaining default settings.");
     return;
   }
-  
+
   /* Open the config file read-only. */
   rc = xfce_rc_simple_open(file, TRUE);
 
@@ -196,23 +203,26 @@ static void hdaps_read(HdapsPlugin *hdaps) {
     DBG("Retaining default settings.");
     return;
   }
-  
+
   /* Read the settings, one at a time. */
-      
+
   /* We use saved_device_name here because we need
      to dupe the string after we read it in from the
      config file. */
   saved_device_name = xfce_rc_read_entry(rc,
-					 "device_name",
-					 DEFAULT_DEVICE_NAME);
+                                         "device_name",
+                                         DEFAULT_DEVICE_NAME);
   hdaps->device_name = g_strdup(saved_device_name);
-  snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
+  snprintf(hdaps->sysfs_file,
+           FILENAME_MAX,
+           UNLOAD_HEADS_FMT,
+           hdaps->device_name);
 
   /* Integers are easier. */
   hdaps->poll_frequency = xfce_rc_read_int_entry(rc,
-						 "poll_frequency",
-						 DEFAULT_POLL_FREQUENCY);
-  
+                                                 "poll_frequency",
+                                                 DEFAULT_POLL_FREQUENCY);
+
   /* And close the config file. */
   xfce_rc_close(rc);
 }
@@ -225,16 +235,16 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
   GtkOrientation  orientation;
 
   /* Allocate memory for the plugin struct, and zero it. */
-  hdaps = panel_slice_new0(HdapsPlugin);
+  hdaps = g_slice_new0(HdapsPlugin);
 
   /* The HdapsPlugin gets a copy of the  XfcePanelPlugin. */
   hdaps->plugin = plugin;
-  
+
   /* Set default values right before reading in the user's settings.
      This way, hdaps_read() doesn't have to set defaults on error
      conditions. */
   hdaps_set_defaults(hdaps);
-  
+
   /* Read any user settings into the HdapsPlugin. */
   hdaps_read(hdaps);
 
@@ -257,7 +267,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,24 +275,16 @@ 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;
 }
 
 
 
 static void hdaps_free(XfcePanelPlugin *plugin,
-		       HdapsPlugin     *hdaps) {
-  
+                       HdapsPlugin     *hdaps) {
+
   GtkWidget *dialog;
 
     /* Destroy the dialog if it's still open. */
@@ -308,30 +310,26 @@ 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);
+  g_slice_free(HdapsPlugin, hdaps);
 }
 
 
 
 static void hdaps_orientation_changed(XfcePanelPlugin *plugin,
-				      GtkOrientation   orientation,
-				      HdapsPlugin     *hdaps) {
-  
+                                      GtkOrientation   orientation,
+                                      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);
 }
 
 
 
 static gboolean hdaps_size_changed(XfcePanelPlugin *plugin,
-				   gint             size,
-				   HdapsPlugin     *hdaps) {
-  
+                                   gint             size,
+                                   HdapsPlugin     *hdaps) {
+
   GtkOrientation orientation;
 
   /* Get the current orientation of the plugin. */
@@ -357,7 +355,7 @@ static gboolean hdaps_size_changed(XfcePanelPlugin *plugin,
 
 static gboolean hdaps_update_status(HdapsPlugin *hdaps) {
   /* This checks the status of HDAPS and updates the
-     widget accordingly. */  
+     widget accordingly. */
 
   /* This just gets the status. */
   int status = parse_int_from_file(hdaps->sysfs_file);
@@ -372,14 +370,14 @@ static gboolean hdaps_update_status(HdapsPlugin *hdaps) {
   if (status > 0) {
     status = HDAPS_ON;
   }
-  
+
   if (status != hdaps->previous_status) {
     /* And we only update the icon if we need to. */
     hdaps_set_icon(hdaps, status);
     hdaps_set_tooltip(hdaps, status);
     hdaps->previous_status = status;
   }
-    
+
   return TRUE;
 }
 
@@ -392,7 +390,9 @@ void hdaps_reset_timeout(HdapsPlugin *hdaps) {
     g_source_remove(hdaps->timeout);
   }
 
-  hdaps->timeout = g_timeout_add(hdaps->poll_frequency, (GSourceFunc)hdaps_update_status, hdaps);
+  hdaps->timeout = g_timeout_add(hdaps->poll_frequency,
+                                 (GSourceFunc)hdaps_update_status,
+                                 hdaps);
 }
 
 
@@ -430,13 +430,13 @@ static void hdaps_construct(XfcePanelPlugin *plugin) {
      connect its event handler. */
   xfce_panel_plugin_menu_show_configure(plugin);
   g_signal_connect(G_OBJECT(plugin), "configure-plugin",
-		   G_CALLBACK(hdaps_configure), hdaps);
+                   G_CALLBACK(hdaps_configure), hdaps);
 
   /* Show the "about" right-click menu item, and
      connect its event handler. */
-  xfce_panel_plugin_menu_show_about(plugin);  
+  xfce_panel_plugin_menu_show_about(plugin);
   g_signal_connect(G_OBJECT(plugin), "about",
-		   G_CALLBACK(hdaps_about), hdaps);
+                   G_CALLBACK(hdaps_about), hdaps);
 
   /* Set the timeout for the function which checks the
      HDAPS status. */