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

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index b00e48c..ac8b2d7 100644
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -94,19 +94,19 @@ 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. */
@@ -119,10 +119,15 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) {
     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;
@@ -162,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;
@@ -202,15 +210,18 @@ static void hdaps_read(HdapsPlugin *hdaps) {
      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);
@@ -224,7 +235,7 @@ 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;
@@ -272,7 +283,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
 
 
 static void hdaps_free(XfcePanelPlugin *plugin,
-		       HdapsPlugin     *hdaps) {
+                       HdapsPlugin     *hdaps) {
 
   GtkWidget *dialog;
 
@@ -300,14 +311,14 @@ static void hdaps_free(XfcePanelPlugin *plugin,
   }
 
   /* ...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. */
   gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation);
@@ -316,8 +327,8 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin,
 
 
 static gboolean hdaps_size_changed(XfcePanelPlugin *plugin,
-				   gint             size,
-				   HdapsPlugin     *hdaps) {
+                                   gint             size,
+                                   HdapsPlugin     *hdaps) {
 
   GtkOrientation orientation;
 
@@ -379,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);
 }
 
 
@@ -417,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);
   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. */