[Pkg-wmaker-commits] [wmhdplop] 01/03: Remove trailing whitespace in recently added dockapps.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Fri Feb 17 10:12:24 UTC 2017


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmhdplop.

commit ee15bf54eb1cb9c4c90eb508f37cc2ff0a31f088
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Fri Dec 23 18:28:17 2016 -0500

    Remove trailing whitespace in recently added dockapps.
---
 ChangeLog        |  20 +++++-----
 README           |   8 ++--
 devnames.c       |  52 ++++++++++++------------
 dockapp_imlib2.c |  34 ++++++++--------
 gkrellm_hdplop.c |  34 ++++++++--------
 global.h         |   4 +-
 procstat.c       |  20 +++++-----
 util.c           |  20 +++++-----
 wmhdplop.c       | 120 +++++++++++++++++++++++++++----------------------------
 wmhdplop.h       |   4 +-
 10 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cedec1d..14ab9dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@
   Fixed device lookup from /proc/partitions & /etc/mtab on feisty fawn.
 
 2006-12-01 (v0.9.8)
-	  
+
 	Added option -F to display hd temperatures in Farenheit degrees
   instead of Celsius.
 
@@ -25,8 +25,8 @@
 2005-06-17 (v0.9.7)
 
 	Should tolerate swapless configurations.
-	
-2005-02-25  
+
+2005-02-25
 
 	Damned there was a leak in both wmforkplop and wmhdplop.
 
@@ -37,36 +37,36 @@
 
 	Added options --32, --48 and --56 for user whose dock is smaller
 	than 64x64.
-	
+
 2004-07-07 (v0.9.5)
 
 	Some small bugfixes, added /usr/X11R6/lib/X11/fonts/truetype to
 	default font path, wmhdplop will try harder to find a
 	font. gkhdplop won't kill gkrellm if not font is found. wmhdplop
 	should work out of box with fvwm2 and others windowmanagers.
-	
+
 	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=257760 should be
 	fixed, and the font names/size can now be changed in the gkhdplop
 	panel.
-	
+
 2004-04-06 (v0.9.4)
 
 	Well well well, wmhdplop won't try anymore to parse device
 	names. Major & minor device number are the only truth. Forget the
 	brain-damaged 0.9.3 which was broken with devfs.
-	
+
 2004-04-06 (v0.9.3)
 
 	Fixed some crashes, and wrong throughput when partitions where
 	monitored.  wmhdplop should recognize automatically scsi drives,
 	and even raid arrays.
-	
+
 2004-04-01
 
 	The release that will rule the desktops \o/ (v0.9.2) Add mouse
 	interactivity.  Add gkhdplop, the port to gkrellm.  wmhdplop
 	-g=wxh is not resizable
-	
+
 2003-12-18
 
 	Improved release \o/ (v0.9.1) Many internal changes. The
@@ -77,7 +77,7 @@
 	arbitray window size. This option has to be used with the
 	gnome-swallow meta applet (see example on the homepage).  The
 	default font-paths are now scanned recursively.
-      
+
 2003-12-06
 
 	Initial release \o/ (v0.9.0)
diff --git a/README b/README
index 2871ef4..88fb3c1 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
                         wmdhplop & gkhdplop
           ------------------------------------------------
 
-  wmhdplop is yet another monitoring applet. This one watches hard-drive 
+  wmhdplop is yet another monitoring applet. This one watches hard-drive
 activity.
   gkhdplop is the port of wmhdplop into a gkrellm2 plugin.
 
@@ -11,12 +11,12 @@ Compilation:
 -----------
   ./configure && make && make install
 
-  Note that this applet uses Imlib2, and requires the script imlib2-config 
+  Note that this applet uses Imlib2, and requires the script imlib2-config
 to be in the path. It won't compile on anything but a recent linux kernel
 (2.4.20 or better, 2.6 is also supported).
 
   gkhdplop requires gtk2 and gkrellm2.
-  
+
 Usage:
 ------
   wmhdplop -h for the list of options. If you have the hddtemp daemon running,
@@ -27,7 +27,7 @@ gkhdplop:
 ---------
   To install the plugin:
     mv gkhdplop.so ~/.gkrellm2/plugins
-  
+
   The configuration is made by clicking with the right button on the plugin.
   BUG: gkhdplop will close gkrellm if no default .ttf font is found (look at
   the messages in console).
diff --git a/devnames.c b/devnames.c
index fdade3a..b1749aa 100644
--- a/devnames.c
+++ b/devnames.c
@@ -29,7 +29,7 @@ DiskList *find_dev(unsigned major, unsigned minor) {
 DiskList *find_id(int hd_id, int part_id) {
   DiskList *dl;
   for (dl = dlist; dl; dl = dl->next) {
-    if (((dl->hd_id == hd_id) || hd_id == -1) && 
+    if (((dl->hd_id == hd_id) || hd_id == -1) &&
         ((dl->part_id == part_id) || part_id == -1)) return dl;
   }
   return NULL;
@@ -89,69 +89,69 @@ static const char *to_num_(unsigned minor) {
 int device_info(unsigned major, unsigned minor, char *name, int *hd_id, int *part_id) {
   switch(major) {
 #ifdef SCSI_DISK0_MAJOR
-    case (SCSI_DISK0_MAJOR): 
+    case (SCSI_DISK0_MAJOR):
 #else
-    case (SCSI_DISK_MAJOR): 
+    case (SCSI_DISK_MAJOR):
 #endif
-      if (name) sprintf(name, "sd%c%s", "abcdefghijklmnop"[(minor)/16], to_num_(minor%16)); 
+      if (name) sprintf(name, "sd%c%s", "abcdefghijklmnop"[(minor)/16], to_num_(minor%16));
       if (hd_id) *hd_id = (minor)/16;
       if (part_id) *part_id = minor%16;
       return 1;
-    case IDE0_MAJOR: 
+    case IDE0_MAJOR:
       if (name) sprintf(name, "hd%c%s", "ab"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 100 + (minor)/64;
       if (part_id) *part_id = minor%64;
       return 2;
-    case IDE1_MAJOR: 
-      if (name) sprintf(name, "hd%c%s", "cd"[(minor)/64], to_num_(minor%64)); 
+    case IDE1_MAJOR:
+      if (name) sprintf(name, "hd%c%s", "cd"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 200 + (minor)/64;
       if (part_id) *part_id = minor%64;
       return 3;
 #ifdef IDE2_MAJOR
-    case IDE2_MAJOR: 
+    case IDE2_MAJOR:
       if (name) sprintf(name, "hd%c%s", "ef"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 300 + (minor)/64;
       if (part_id) *part_id = minor%64;
       return 4;
 #endif
 #ifdef IDE3_MAJOR
-    case IDE3_MAJOR: 
+    case IDE3_MAJOR:
       if (name) sprintf(name, "hd%c%s", "gh"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 400 + (minor)/64;
-      if (part_id) *part_id = minor%64;      
+      if (part_id) *part_id = minor%64;
       return 5;
 #endif
 #ifdef IDE4_MAJOR
-    case IDE4_MAJOR: 
+    case IDE4_MAJOR:
       if (name) sprintf(name, "hd%c%s", "ij"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 400 + (minor)/64;
-      if (part_id) *part_id = minor%64;      
+      if (part_id) *part_id = minor%64;
       return 6;
 #endif
 
 #ifdef IDE5_MAJOR
-    case IDE5_MAJOR: 
+    case IDE5_MAJOR:
       if (name) sprintf(name, "hd%c%s", "kl"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 400 + (minor)/64;
-      if (part_id) *part_id = minor%64;      
+      if (part_id) *part_id = minor%64;
       return 7;
 #endif
 
 #ifdef IDE6_MAJOR
-    case IDE6_MAJOR: 
+    case IDE6_MAJOR:
       if (name) sprintf(name, "hd%c%s", "mn"[(minor)/64], to_num_(minor%64));
       if (hd_id) *hd_id = 400 + (minor)/64;
-      if (part_id) *part_id = minor%64;      
+      if (part_id) *part_id = minor%64;
       return 8;
 #endif
 
 
 #ifdef MD_MAJOR
-    case (MD_MAJOR):       
+    case (MD_MAJOR):
       if (name) sprintf(name, "md%s", to_num_(minor));
       if (hd_id) *hd_id = 400 + minor;
-      if (part_id) *part_id = 0;            
-      return 9;      
+      if (part_id) *part_id = 0;
+      return 9;
 #endif
 
 #ifdef BLOCK_EXT_MAJOR
@@ -181,13 +181,13 @@ int is_partition(unsigned major, unsigned minor) {
 int device_id_from_name(const char *devname__, unsigned *pmajor, unsigned *pminor) {
   if (strlen(devname__)>=512) return -1;
   char *devname_, devname[512];
-  
+
   devname_ = str_substitute(devname__, "/dev/mapper", "/dev");
 
   struct stat stat_buf;
   BLAHBLAH(1,printf("looking for %s in /dev..\n", devname_));
-  
-  if (devname_[0] != '/') snprintf(devname,512,"/dev/%s", devname_); 
+
+  if (devname_[0] != '/') snprintf(devname,512,"/dev/%s", devname_);
   else snprintf(devname,512,"%s",devname_);
 
   free(devname_); devname_ = 0;
@@ -213,7 +213,7 @@ int device_id_from_name(const char *devname__, unsigned *pmajor, unsigned *pmino
 
 /* add a hard-drive if it is a regular ide/scsi/md disk/partition, or return NULL */
 static DiskList *create_device(unsigned major, unsigned minor, const char *mtab_name) {
-  DiskList *dl; 
+  DiskList *dl;
   char dev_path[512];
   ALLOC_OBJ(dl);
   if (mtab_name && strlen(mtab_name)) dl->name = strdup(mtab_name);
@@ -222,11 +222,11 @@ static DiskList *create_device(unsigned major, unsigned minor, const char *mtab_
   }
   BLAHBLAH(1, printf("create_device(major=%d, minor=%d, mtab_name=%s) : name=%s\n", major,minor,mtab_name,dl->name));
   dl->major = major; dl->minor = minor;
-  if (device_info(major,minor,dev_path,&dl->hd_id,&dl->part_id) == 0) { 
+  if (device_info(major,minor,dev_path,&dl->hd_id,&dl->part_id) == 0) {
     BLAHBLAH(1, printf("(%d,%d) is not a known disc type..\n", major,minor));
-    free(dl); return NULL; 
+    free(dl); return NULL;
   }
-  dl->dev_path = malloc(strlen(dev_path)+6); assert(dl->dev_path); 
+  dl->dev_path = malloc(strlen(dev_path)+6); assert(dl->dev_path);
   sprintf(dl->dev_path, "/dev/%s", dev_path);
   dl->next = NULL;
   if (dl->part_id == 0)
diff --git a/dockapp_imlib2.c b/dockapp_imlib2.c
index 4d21115..3af45d9 100644
--- a/dockapp_imlib2.c
+++ b/dockapp_imlib2.c
@@ -29,7 +29,7 @@ static void dockimlib2_set_rect_shape(DockImlib2 *dock, int x, int y, int w, int
   XFillRectangle(dock->display, mask, gc, x,y,w,h);
   XFreeGC(dock->display,gc);
   /* setup shaped window */
-  XShapeCombineMask(dock->display, dock->normalwin, ShapeBounding, 
+  XShapeCombineMask(dock->display, dock->normalwin, ShapeBounding,
                     0, 0, mask, ShapeSet);
   if (dock->iconwin)
     XShapeCombineMask(dock->display, dock->iconwin, ShapeBounding,
@@ -45,7 +45,7 @@ void set_window_title(Display *display, Window win, char *window_title, char *ic
   rc = XStringListToTextProperty(&window_title,1, &window_title_property); assert(rc);
   XSetWMName(display, win, &window_title_property);
   XFree(window_title_property.value);
-  
+
   /* icon window name */
   rc = XStringListToTextProperty(&icon_title,1, &window_title_property); assert(rc);
   XSetWMIconName(display, win, &window_title_property);
@@ -72,10 +72,10 @@ static void dockimlib2_xinit(DockImlib2 *dock, DockImlib2Prefs *prefs) {
   char sdockgeom[40];
 
   assert(prefs->argv); // this should be always set ..
-  
+
   if (prefs->flags & DOCKPREF_DISPLAY) sdisplay = prefs->display;
   if (prefs->flags & DOCKPREF_GEOMETRY) { pgeom = prefs->geometry; undocked = 1; }
-  
+
   dock->display = XOpenDisplay(sdisplay);
   if(!dock->display) DOCKIMLIB2_ERR("Couldn't connect to display %s\n", sdisplay);
   dock->screennum = DefaultScreen(dock->display);
@@ -99,8 +99,8 @@ static void dockimlib2_xinit(DockImlib2 *dock, DockImlib2Prefs *prefs) {
   xsh->flags = XWMGeometry(dock->display, dock->screennum, pgeom, sdockgeom, 0,
                            xsh, &xsh->x, &xsh->y, &xsh->width, &xsh->height, &i);
   if (undocked) {
-    dock->win_width  = dock->w = xsh->width; 
-    dock->win_height = dock->h = xsh->height; 
+    dock->win_width  = dock->w = xsh->width;
+    dock->win_height = dock->h = xsh->height;
     dock->x0 = dock->y0 = 0;
   }
   xsh->base_width = xsh->width;
@@ -115,7 +115,7 @@ static void dockimlib2_xinit(DockImlib2 *dock, DockImlib2Prefs *prefs) {
                                         xsh->x, xsh->y, xsh->width, xsh->height, 0,
                                         BlackPixel(dock->display, dock->screennum),
                                         WhitePixel(dock->display, dock->screennum));
-  
+
   if(!dock->normalwin) DOCKIMLIB2_ERR("Couldn't create window\n");
   if (!undocked) {
     /* create icon window */
@@ -133,7 +133,7 @@ static void dockimlib2_xinit(DockImlib2 *dock, DockImlib2Prefs *prefs) {
 
   /* start with an empty window in order to get the background pixmap */
   dockimlib2_set_rect_shape(dock,32,32,1,0);
-  
+
   /* set window manager hints */
   if (!undocked) {
     XWMHints *xwmh;
@@ -157,7 +157,7 @@ static void dockimlib2_xinit(DockImlib2 *dock, DockImlib2Prefs *prefs) {
     long evmask = ExposureMask |  ButtonPressMask | ButtonReleaseMask | VisibilityChangeMask |
       PointerMotionMask | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
     XSelectInput(dock->display, dock->normalwin, evmask);
-    if (dock->iconwin) 
+    if (dock->iconwin)
       XSelectInput(dock->display, dock->iconwin, evmask);
   }
   XSetWMProtocols(dock->display, dock->normalwin, &dock->atom_WM_DELETE_WINDOW, 1);
@@ -191,7 +191,7 @@ void dockimlib2_gkrellm_xinit(DockImlib2 *dock, GdkDrawable *gkdrawable) {
 
   /* start with an empty window in order to get the background pixmap */
   dockimlib2_set_rect_shape(dock,32,32,1,0);
-  
+
   /* map the main window */
   XMapWindow(dock->display, dock->normalwin);
 }
@@ -199,7 +199,7 @@ void dockimlib2_gkrellm_xinit(DockImlib2 *dock, GdkDrawable *gkdrawable) {
 
 static void add_fontpath(const char *path, int recurse) {
   struct stat st;
-    
+
   if (stat(path,&st) != 0 ||
       !S_ISDIR(st.st_mode)) return;
   if (recurse > 3) return; /* prevent scanning of whole hd/infinite recursions in case of a bad symlink */
@@ -330,18 +330,18 @@ DockImlib2* dockimlib2_gkrellm_setup(int x0, int y0, int w, int h, DockImlib2Pre
 static char *last_font_name = 0;
 
 const char* dockimlib2_last_loaded_font() { return last_font_name; }
- 
+
 Imlib_Font *imlib_load_font_nocase(const char *name) {
   Imlib_Font *f;
   int i;
   if (last_font_name) free(last_font_name);
-  last_font_name = strdup(name); 
+  last_font_name = strdup(name);
   if ((f = imlib_load_font(last_font_name))) return f;
   for (i=0; last_font_name[i]; ++i) last_font_name[i] = tolower(last_font_name[i]);
   if ((f = imlib_load_font(last_font_name))) return f;
   for (i=0; last_font_name[i]; ++i) last_font_name[i] = toupper(last_font_name[i]);
   f = imlib_load_font(last_font_name);
-  return f; 
+  return f;
 }
 
 Imlib_Font *load_font(char *prefname, char **flist_) {
@@ -375,8 +375,8 @@ Imlib_Font *load_font(char *prefname, char **flist_) {
   return f;
 }
 
-/* 
-   merges dock->bg and dock->img, and renders the result on the window 
+/*
+   merges dock->bg and dock->img, and renders the result on the window
    this function does not alter the imlib context
 */
 void dockimlib2_render(DockImlib2 *dock) {
@@ -397,7 +397,7 @@ void dockimlib2_render(DockImlib2 *dock) {
     if (dock->iconwin) {
       imlib_context_set_drawable(dock->iconwin);
       imlib_render_image_on_drawable(dock->x0, dock->y0);
-    }    
+    }
     /* XSetWindowBackgroundPixmap(dock->display, dock->GKwin, dock->win);
        XClearWindow(dock->display, dock->GKWin); */
     imlib_free_image();
diff --git a/gkrellm_hdplop.c b/gkrellm_hdplop.c
index ed14534..5cead20 100644
--- a/gkrellm_hdplop.c
+++ b/gkrellm_hdplop.c
@@ -50,7 +50,7 @@ static GkrellmChartconfig *chart_config = NULL;
 
 #define PLUGIN_HEIGHT 64
 
-static gint timeout_id; 
+static gint timeout_id;
 static int option_timer = 0;
 
 /* Options stuffs */
@@ -115,10 +115,10 @@ static void create_plugin(GtkWidget *vbox, gint first_create)
   if(first_create) {
     chart = gkrellm_chart_new0();
   }
-  
+
   gkrellm_set_chart_height_default(chart, PLUGIN_HEIGHT);
   gkrellm_chart_create(vbox, mon, chart, &chart_config);
-  
+
   if (first_create) {
     hdplop_main(chart->w, chart->h, chart->drawing_area->window);
   } else {
@@ -128,7 +128,7 @@ static void create_plugin(GtkWidget *vbox, gint first_create)
   if (first_create) {
     //printf("chart : w=%d, h=%d\n", chart->w, chart->h);
     gtk_signal_connect(GTK_OBJECT(chart->drawing_area),
-		       "expose_event", (GtkSignalFunc) chart_expose_event, NULL); 
+		       "expose_event", (GtkSignalFunc) chart_expose_event, NULL);
     gtk_signal_connect(GTK_OBJECT(chart->drawing_area),
 		       "button_release_event", GTK_SIGNAL_FUNC(button_release_event), NULL);
     g_signal_connect(G_OBJECT(chart->drawing_area),
@@ -144,7 +144,7 @@ static void option_toggled_cb(GtkToggleButton *button, gpointer user_data UNUSED
 {
   gboolean active = gtk_toggle_button_get_active(button);
   GtkWidget *togglebutton = GTK_WIDGET(button);
-  
+
   if (togglebutton == swap_check) {
      Prefs.disable_swap_matrix = !active;
   }
@@ -211,7 +211,7 @@ static void create_plugin_tab(GtkWidget *tab_vbox)
   GtkWidget *about_tab = NULL;
   GtkWidget *about = NULL;
   GtkWidget *main_box;
-  
+
   static gchar *info_text[] =
     {
       "<b>" PLUGIN_NAME "\n\n",
@@ -228,7 +228,7 @@ static void create_plugin_tab(GtkWidget *tab_vbox)
       "- Several glittering color schemes...\n",
       "- Popup display with the io throughput...\n",
     };
-  
+
   static gchar *about_text =
     _(
       PLUGIN_NAME " " PLUGIN_VERSION "\n"
@@ -244,10 +244,10 @@ static void create_plugin_tab(GtkWidget *tab_vbox)
   tabs = gtk_notebook_new();
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tabs), GTK_POS_TOP);
   gtk_box_pack_start(GTK_BOX(tab_vbox), tabs, TRUE, TRUE, 0);
-  
+
   /* Options tab */
   options_tab = gkrellm_gtk_notebook_page(tabs, _("Options"));
-  
+
   main_box = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_name(main_box, "main_box");
   gtk_widget_ref(main_box);
@@ -263,7 +263,7 @@ static void create_plugin_tab(GtkWidget *tab_vbox)
   gkrellm_gtk_check_button_connected(main_box, &swap_check, !Prefs.disable_swap_matrix, 1, 1, 0,
 				     option_toggled_cb, NULL, _("Show swap activity"));
   /* hdlist button */
-  gkrellm_gtk_check_button_connected(main_box, &hdlist_check, 
+  gkrellm_gtk_check_button_connected(main_box, &hdlist_check,
 				     (Prefs.hdlist_pos == AL_NONE)?FALSE:TRUE, 1, 1, 0,
 				     option_toggled_cb, NULL, _("Show disk name"));
   /* leds button */
@@ -278,17 +278,17 @@ static void create_plugin_tab(GtkWidget *tab_vbox)
   /* colormap spin button */
   gkrellm_gtk_spin_button(main_box, NULL, Prefs.iomatrix_colormap, 0, 4, 1, 1, 0, 0,
 			  cb_colormap_modified, NULL, FALSE, _("Colormap"));
-  
+
   /* threshold spin button */
   gkrellm_gtk_spin_button(main_box, &throughput_threshold, Prefs.popup_throughput_threshold, 0., 500, 0.1, 1, 1, 0,
                           cb_spinbutton_modified, NULL, FALSE, _("minimum io throughput (MB/s)"));
-  
+
   {
     GtkWidget *frame = gtk_frame_new("Fonts");
     gtk_box_pack_start(GTK_BOX(main_box), frame, TRUE, FALSE, 0);
 
     GtkWidget *hbox0 = gtk_hbox_new(FALSE, 4);
-    gtk_container_add(GTK_CONTAINER(frame), hbox0); 
+    gtk_container_add(GTK_CONTAINER(frame), hbox0);
 
     GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(hbox0), vbox, TRUE, FALSE, 0);
@@ -350,7 +350,7 @@ static void load_plugin_config(gchar *config_line)
                 &Prefs.iomatrix_colormap,
                 &Prefs.popup_throughput_threshold,
                 sf, bf);
-  if (n>= 8) Prefs.smallfontname = strdup(sf); 
+  if (n>= 8) Prefs.smallfontname = strdup(sf);
   if (n>= 9) Prefs.bigfontname = strdup(bf);
 }
 
@@ -362,15 +362,15 @@ static GkrellmMonitor hdplop_mon =
   NULL,                /* The update_plugin() function             */
   create_plugin_tab,   /* The create_plugin_tab() config function  */
   NULL,                /* The apply_plugin_config() function       */
-  
+
   save_plugin_config,  /* The save_plugin_config() function        */
   load_plugin_config,  /* The load_plugin_config() function        */
   PLUGIN_KEYWORD,      /* config keyword                           */
-  
+
   NULL,                /* Undefined 2                              */
   NULL,                /* Undefined 1                              */
   NULL,                /* private                                  */
-  
+
   MON_CPU,             /* Insert plugin before this monitor.       */
   NULL,                /* Handle if a plugin, filled in by GKrellM */
   NULL                 /* path if a plugin, filled in by GKrellM   */
diff --git a/global.h b/global.h
index 099808c..e7e94eb 100644
--- a/global.h
+++ b/global.h
@@ -27,8 +27,8 @@
 #ifndef NO_BITFIELDS
 #  define BITFIELD(n) :n
 #else
-#  define BITFIELD(n) 
-#endif 
+#  define BITFIELD(n)
+#endif
 
 #include "dockapp_imlib2.h"
 
diff --git a/procstat.c b/procstat.c
index 18c74cf..e7eed1b 100644
--- a/procstat.c
+++ b/procstat.c
@@ -28,7 +28,7 @@ void pstat_add(struct pstat *pst, unsigned long v) {
 void pstat_advance(struct pstat *pst) {
   unsigned long v = pst->slices[pst->cur_slice];
   if (pst->total)
-    pst->slices[pst->cur_slice] -= pst->total; 
+    pst->slices[pst->cur_slice] -= pst->total;
   else pst->slices[pst->cur_slice] = 0;
   pst->total = v;
   if (++pst->cur_slice >= pst->nslice) pst->cur_slice = 0;
@@ -80,7 +80,7 @@ void update_stats() {
   while (fgets(line, sizeof(line), f)) {
     int major, minor;
     unsigned long nr, nw;
-    const char *fmt = use_proc_diskstats ? 
+    const char *fmt = use_proc_diskstats ?
       "%d %d %200s %*d %*d %lu %*d %*d %*d %lu" :
       "%d %d %*u %200s %*d %*d %lu %*d %*d %*d %lu";
     if (sscanf(line, fmt, &major, &minor, hdname, &nr, &nw) == 5 ||
@@ -90,10 +90,10 @@ void update_stats() {
       DiskList *dl;
       if (readok == 0) readok = 1;
       if ((dl=find_dev(major,minor))) {
-        dl->touched_r = (dl->nr - nr) ? 10 : dl->touched_r; 
-        dl->touched_w = (dl->nw - nw) ? 10 : dl->touched_w; 
+        dl->touched_r = (dl->nr - nr) ? 10 : dl->touched_r;
+        dl->touched_w = (dl->nw - nw) ? 10 : dl->touched_w;
         dl->nr = nr; dl->nw = nw;
-        if (is_displayed(dl->hd_id,dl->part_id) && 
+        if (is_displayed(dl->hd_id,dl->part_id) &&
             ((dl->part_id && (!find_id(dl->hd_id, 0) || !is_displayed(dl->hd_id, 0))) || /* partition without host disk */
              (dl->part_id == 0))) /* disk */
           {
@@ -134,8 +134,8 @@ void update_stats() {
   pstat_advance(&ps.swap_in);pstat_advance(&ps.swap_out);
   if (readok == 0) { fprintf(stderr, "warning: could not find any info in %s (kernel too old?)\n", proc_fname); exit(1); }
   else if (readok == 1) { ONLY_ONCE(fprintf(stderr, "warning: could not find any monitored disc in %s\n", proc_fname)); }
-  BLAHBLAH(1,printf("swap: %5.2f,%5.2f disc: %5.2f,%5.2f MB/s\n", 
-                    get_swapin_throughput(), get_swapout_throughput(), 
+  BLAHBLAH(1,printf("swap: %5.2f,%5.2f disc: %5.2f,%5.2f MB/s\n",
+                    get_swapin_throughput(), get_swapout_throughput(),
                     get_read_throughput(), get_write_throughput()));
 }
 
@@ -163,8 +163,8 @@ void init_stats(float update_interval) {
   if (!swap_list()) {
     fprintf(stderr, "Warning: no swap partition found in /proc/swaps !!\n");
   }
-  if ((f=fopen("/proc/diskstats","r"))) { 
-    use_proc_diskstats = 1; fclose(f); 
+  if ((f=fopen("/proc/diskstats","r"))) {
+    use_proc_diskstats = 1; fclose(f);
   }
   else { use_proc_diskstats = 0; }
   BLAHBLAH(1,printf("using %s for disc statistics\n", use_proc_diskstats ? "/proc/diskstats" : "/proc/partitions"));
@@ -196,7 +196,7 @@ void scan_all_hd(int add_partitions) {
     while (fgets(s,512,f)) {
       unsigned major, minor;
       char name[512]; name[0] = 0;
-      if (sscanf(s,"%d %d %*d %500s", &major, &minor, name)==3) {        
+      if (sscanf(s,"%d %d %*d %500s", &major, &minor, name)==3) {
         int hd_id, part_id;
         /* on n'ajoute que les disques dont au moins une partoche etait dans mtab */
         if (device_info(major,minor,NULL,&hd_id,&part_id) != 0 && part_id == 0 && find_id(hd_id,-1)) {
diff --git a/util.c b/util.c
index ed4e441..d66ec32 100644
--- a/util.c
+++ b/util.c
@@ -12,7 +12,7 @@ str_dup(const char *src) {
 }
 
 /*
-  verifie si la chaine est vide (cad si elle ne contient que des caract�res non imprimables 
+  verifie si la chaine est vide (cad si elle ne contient que des caract�res non imprimables
 */
 int
 str_is_empty(const char *s) {
@@ -101,7 +101,7 @@ str_substitute(const char *src, const char *key, const char *substitution) {
 }
 
 /* quotage pour les commandes externes.. � priori c'est comme pour open_url
-   mais bon.. je me refuse � donner la moindre garantie sur la s�curit� 
+   mais bon.. je me refuse � donner la moindre garantie sur la s�curit�
 
    be aware
 */
@@ -143,7 +143,7 @@ void gen_crc_table(void)                /* build the crc table */
 {
   unsigned crc, poly;
   int	i, j;
-  
+
   poly = 0xEDB88320;
   for (i = 0; i < 256; i++)
     {
@@ -164,7 +164,7 @@ unsigned str_hash(const unsigned char *s, int max_len)    /* calculate the crc v
 {
   unsigned crc;
   int i;
-  
+
   if (crc_table == NULL) {
     crc_table = calloc(256, sizeof(unsigned));
     gen_crc_table();
@@ -180,12 +180,12 @@ unsigned str_hash(const unsigned char *s, int max_len)    /* calculate the crc v
 unsigned char char_trans[256];
 static int char_trans_init = 0;
 
-static void 
+static void
 init_char_trans()
 {
-  const unsigned char *trans_accents  = 
+  const unsigned char *trans_accents  =
     (const unsigned char*) "���������������������������������������";
-  const unsigned char *trans_accents2 = 
+  const unsigned char *trans_accents2 =
     (const unsigned char*) "eeeeeeeeaaaaaaaauuuucciiiiiiiioooooooon";
   int i;
 
@@ -254,7 +254,7 @@ str_printf(const char *fmt, ...)
       s_sz *= 2;
       assert(s_sz < 100000);
       s = realloc(s, s_sz); assert(s);
-    } else 
+    } else
       break;
   }
   s = realloc(s, strlen(s)+1); assert(s);
@@ -275,7 +275,7 @@ str_fget_line(FILE *f)
   while ((c = fgetc(f)) > 0) {
     if (c >= ' ' || c == '\t') {
       s[i++] = c;
-      if (i == s_sz) { 
+      if (i == s_sz) {
 	s_sz *= 2; assert(s_sz < 100000);
 	s = realloc(s, s_sz); assert(s);
       }
@@ -296,7 +296,7 @@ str_trim(unsigned char *s) {
   j = strlen((char*)s)-1;
   while (j>=0 && s[j] <= ' ') s[j--] = 0;
 
-  i = 0; 
+  i = 0;
   while (s[i] && s[i] <= ' ') i++;
   if (i<=j) {
     memmove(s, s+i, j+2-i);
diff --git a/wmhdplop.c b/wmhdplop.c
index 91b6d52..5b18932 100644
--- a/wmhdplop.c
+++ b/wmhdplop.c
@@ -11,10 +11,10 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   USA.
 */
-  
+
 #include "config.h"
 #include <string.h>
 #include <sys/types.h>
@@ -69,7 +69,7 @@ void update_io_matrix_rw(App *app, float mbs, int op) {
     l->next = io->ops;
     l->n = (int)(log2f(1+v*1024)/10.);
     l->op = op;
-    l->i = rand() % io->h; 
+    l->i = rand() % io->h;
     l->j = rand() % io->w;
     io->ops = l;
   }
@@ -97,24 +97,24 @@ void evolve_io_matrix(App *app, DATA32 * __restrict buff) {
     } else po = po->next;
     o = no;
   }
-  
+
   /* brain-dead diffusion */
   pl = io->v[io->h+2];
   int * __restrict l = io->v[io->h+3];
-  for (j=1; j < io->w+1; ++j) pl[j] = 0;  
+  for (j=1; j < io->w+1; ++j) pl[j] = 0;
   for (i=1; i < io->h+1; ++i) {
     /*
     for (j=1; j < io->w+1; ++j) {
       l[j] = io->v[i][j]*0.99 + (io->v[i][j-1] + io->v[i][j+1] + pl[j] + io->v[i+1][j] - 4*io->v[i][j])/5.;
     }
     */
-  /*  
+  /*
     float *__restrict nl = io->v[i+1]+1;
     float *__restrict cl = io->v[i];
     for (j=1; j < io->w+1; ++j, ++cl) {
       l[j] = (cl[1])*0.99 + (cl[0] + cl[2] + pl[j] + *nl++ - 4*cl[1])/5.;
     }
-*/    
+*/
     int *__restrict dest;
     int *__restrict pn = io->v[i+1]+1;
     int *__restrict pc = io->v[i]+1;
@@ -134,7 +134,7 @@ void evolve_io_matrix(App *app, DATA32 * __restrict buff) {
       }
       *buff++ = io->cm.p[v+CMAPSZ/2];
     }
-      
+
     tmp = pl; pl = io->v[i]; io->v[i] = l; l = tmp;
     io->v[io->h+2] = pl; io->v[io->h+3] = l;
   }
@@ -146,10 +146,10 @@ static void draw_io_matrix(App *app, DATA32 * __restrict buff) {
   IOMatrix *io = &app->iom;
   int i,j;
   for (i=0; i < io->h; ++i) {
-    for (j=0; j < io->w; ++j) {  
+    for (j=0; j < io->w; ++j) {
       float vv = io->v[i+1][j+1];
       int v = (int)(vv * 32768); //((int)ldexpf(vv,15)); /* (int)v*(2^15) */
-      //if (v == 0) continue; 
+      //if (v == 0) continue;
       //if (v < 0) v*=3; /* write op are rare, so they are brighter .. */
       if (v > CMAPSZ/4) { /* cheaper than a log(vv) ... */
         v = MIN(CMAPSZ/4  + (v-CMAPSZ/4)/16,CMAPSZ/2-1);
@@ -198,7 +198,7 @@ void draw_swap_matrix(App *app) {
         if (v > 0) imlib_context_set_color(255, 50, 50, MIN(v+80,255));
         else     imlib_context_set_color(50, 255, 50, MIN(v+80,255));
         imlib_image_fill_rectangle(row*sm->w+1,col*sm->w+1,sm->w-1,sm->w-1);
-	
+
 	if (sm->intensity[row][col] > 0) {
 	  sm->intensity[row][col]--;
 	} else if (sm->intensity[row][col] < 0) {
@@ -252,7 +252,7 @@ static void query_hddtemp(App *app) {
     fprintf(stderr,"can't connect to 127.0.0.1:%d : %s\n", Prefs.hddtemp_port, strerror(errno));
 #ifdef GKRELLM
     Prefs.enable_hddtemp = 0;
-#endif 
+#endif
     return;
   }
   int n = 0;
@@ -276,11 +276,11 @@ static void query_hddtemp(App *app) {
           s=strchr(s,'|');
           if (s && ((s=strchr(s+1,'|')))) {
 	    int unit = 'C';
-            char *p = strchr(++s,'|'), oldv=0; 
-	    if (p) { 
-	      oldv = *p; 
+            char *p = strchr(++s,'|'), oldv=0;
+	    if (p) {
+	      oldv = *p;
 	      if (*p && toupper(p[1]) == 'F') unit = 'F';
-	      *p = 0; 
+	      *p = 0;
 	    }
             BLAHBLAH(1,printf("temperature of '%s' : %s %c\n", dl->name, s, unit));
             if (strcmp(s,"SLP") == 0) app->disk_temperature[cnt] = -2;
@@ -300,7 +300,7 @@ static void query_hddtemp(App *app) {
         }
       }
     }
-  } else { fprintf(stderr, "error with hddtemp: %s\n", strerror(errno)); }  
+  } else { fprintf(stderr, "error with hddtemp: %s\n", strerror(errno)); }
   close(fd);
 }
 
@@ -309,7 +309,7 @@ const char *power_mode_str(int m) {
   case HD_ACTIVE: return "active/idle";
   case HD_STANDBY: return "standby";
   case HD_SLEEP: return "sleep";
-  case HD_UNKNOWN: 
+  case HD_UNKNOWN:
   default:
     return "unknown/error";
   }
@@ -340,9 +340,9 @@ int is_displayed(int hd_id, int part_id) {
 
 void change_displayed_hd(int dir) {
   DiskList *dl = find_id(app->filter_hd, app->filter_part);
-  if (dl == NULL) { 
-    app->filter_hd = -1; app->filter_part = -1; 
-    dl = find_id(app->filter_hd, app->filter_part); assert(dl); 
+  if (dl == NULL) {
+    app->filter_hd = -1; app->filter_part = -1;
+    dl = find_id(app->filter_hd, app->filter_part); assert(dl);
   }
   else if (dir > 0) {
     if (app->filter_hd == -1 && app->filter_part == -1) {
@@ -395,7 +395,7 @@ void prev_displayed_hd() {
 const char *shorten_name(DiskList *dl) {
   static char s[8];
   if (dl->name && strlen(dl->name)) {
-    const char *p = dl->name; 
+    const char *p = dl->name;
     if (strchr(p,'/')) p = strrchr(p,'/')+1;
     if (strlen(p) == 0) p = dl->name;
     snprintf(s, sizeof s, "%s%s", dl->part_id ? " " : "", p);
@@ -406,11 +406,11 @@ const char *shorten_name(DiskList *dl) {
 static void draw_hdlist(App *app) {
   if (Prefs.hdlist_pos == AL_NONE) return;
   DiskList *dl;
-  
+
   int dev_cnt, hd_cnt, w;
-  static int lw = -1, lh = -1, lx = -1, ly = -1, h = -1, 
+  static int lw = -1, lh = -1, lx = -1, ly = -1, h = -1,
     reshape_cnt = 0;
-  
+
   if (!app->smallfont) return;
   if (app->displayed_hd_changed) { lx = -1; app->displayed_hd_changed = 0; }
   imlib_context_set_font(app->smallfont);
@@ -433,24 +433,24 @@ static void draw_hdlist(App *app) {
     sethw(app,lw,lh,Prefs.hdlist_pos,&lx,&ly,&lw,&lh);
     reshape_cnt = app->reshape_cnt;
   }
-  
+
   imlib_context_set_color(100, 100, 100, 150);
   imlib_image_fill_rectangle(lx,ly,lw,lh);
   imlib_context_set_color(100, 100, 100, 200);
   imlib_image_draw_rectangle(lx-1,ly-1,lw+2,lh+2);
-  
+
   for (dl = first_dev_in_list(), dev_cnt=hd_cnt=-1; dl; dl = dl->next) {
     if (dl->part_id==0) ++hd_cnt; if (!is_displayed(dl->hd_id, dl->part_id)) continue; ++dev_cnt;
     int x = lx, y = ly + lh - dev_cnt * h;
     if (!Prefs.disable_hd_leds) {
-      if (dl->touched_r) { 
-        imlib_context_set_color(50, 255, 50, 25*dl->touched_r--); 
-        imlib_image_fill_rectangle(lx+1,y-5,3,3); 
+      if (dl->touched_r) {
+        imlib_context_set_color(50, 255, 50, 25*dl->touched_r--);
+        imlib_image_fill_rectangle(lx+1,y-5,3,3);
       }
-      if (dl->touched_w) { 
+      if (dl->touched_w) {
         imlib_context_set_color(255,100-10*dl->touched_w,100-10*dl->touched_w, 25*dl->touched_w - 1);
         dl->touched_w--;
-        imlib_image_fill_rectangle(lx+1,y-9,3,3); 
+        imlib_image_fill_rectangle(lx+1,y-9,3,3);
       }
       x += 5;
     }
@@ -458,9 +458,9 @@ static void draw_hdlist(App *app) {
     my_imlib_text_draw(x,y-h,shorten_name(dl));
     if (dl->part_id==0 && app->disk_temperature[hd_cnt] != -1) {
       char s[200];
-      if (app->disk_temperature[hd_cnt] != -2) { 
-        snprintf(s,200,"%d",app->disk_temperature[hd_cnt]); 
-      } else { 
+      if (app->disk_temperature[hd_cnt] != -2) {
+        snprintf(s,200,"%d",app->disk_temperature[hd_cnt]);
+      } else {
         strcpy(s,"SLP");
       }
       imlib_get_text_size(s,&w,&h);
@@ -510,22 +510,22 @@ static void draw_throughput(App *app) {
   static int lw = -1, lh = -1, lx = -1, ly = -1;
   static int reshape_cnt = 0;
   if (Prefs.popup_throughput_pos == AL_NONE) return;
-  
+
   if (!app->bigfont) return;
   imlib_context_set_font(app->bigfont);
   /* get dimensions (only once) */
-  if (lx == -1 || app->reshape_cnt != reshape_cnt) {    
+  if (lx == -1 || app->reshape_cnt != reshape_cnt) {
     imlib_get_text_size("00.0M/s",&lw,&lh);
     if (lw > (int)(app->dock->w*3/4)) { lw = app->dock->w; }
     sethw(app,lw,lh,Prefs.popup_throughput_pos,&lx,&ly,&lw,&lh);
     reshape_cnt = app->reshape_cnt;
   }
-  
+
   if (get_read_mean_throughput() + get_write_mean_throughput() > Prefs.popup_throughput_threshold) {
     tpstep = MIN(tpstep+1,4);
     snprintf(tpmsg,sizeof tpmsg, "%.1fM/s",get_read_mean_throughput() + get_write_mean_throughput());
     imlib_get_text_size(tpmsg,&tpw,&tph);
-    if (tpw > lw) { 
+    if (tpw > lw) {
       snprintf(tpmsg,sizeof tpmsg, "%.1fM",get_read_mean_throughput() + get_write_mean_throughput());
       imlib_get_text_size(tpmsg,&tpw,&tph);
     }
@@ -598,10 +598,10 @@ static void event_loop(App *app) {
       switch (ev.type) {
       case ClientMessage:
         if (ev.xclient.message_type == app->dock->atom_WM_PROTOCOLS
-            && ev.xclient.format == 32 
+            && ev.xclient.format == 32
             && (Atom)ev.xclient.data.l[0] == app->dock->atom_WM_DELETE_WINDOW) {
           exit(0);
-        } 
+        }
         break;
       case ButtonRelease:
         //exit(0);
@@ -609,19 +609,19 @@ static void event_loop(App *app) {
         else if (ev.xbutton.button == Button5 || ev.xbutton.button == Button1) next_displayed_hd(+1);
         break;
       case ConfigureNotify: {
-        if (app->dock->iconwin == None && 
-            (ev.xconfigure.width != (int)app->dock->win_width || 
+        if (app->dock->iconwin == None &&
+            (ev.xconfigure.width != (int)app->dock->win_width ||
              ev.xconfigure.height != (int)app->dock->win_height)) {
           app->dock->w = app->dock->win_width = ev.xconfigure.width;
           app->dock->h = app->dock->win_height = ev.xconfigure.height;
           reshape(ev.xconfigure.width, ev.xconfigure.height); //app->dock->w, app->dock->h, None);
-          /*printf("ConfigureNotify : %dx%d %dx%d\n", 
-                 ev.xconfigure.width, ev.xconfigure.height, 
+          /*printf("ConfigureNotify : %dx%d %dx%d\n",
+                 ev.xconfigure.width, ev.xconfigure.height,
                  app->sm.nrow, app->sm.ncol);*/
         }
       } break;
       }
-    } 
+    }
     if (tic_cnt % app->update_stats_mult == 0) {
       update_stats();
       if (!Prefs.disable_io_matrix)   update_io_matrix(app);
@@ -655,7 +655,7 @@ static void event_loop(App *app) {
 
 void setup_cmap(cmap *m) {
   struct {
-    float x0; 
+    float x0;
     DATA32 c;
   } colors0[] = {{-128, 0xff8080},
                  {- 70, 0xF00000},
@@ -684,7 +684,7 @@ void setup_cmap(cmap *m) {
                    {  16, 0x000040},
                    {  34, 0x0000ff},
                    {  60, 0x0000A0},
-                   {+128, 0x000040}}, 
+                   {+128, 0x000040}},
       colors3[] = {{-128, 0x500060},
                    { -60, 0x500050},
                    { -34, 0x000000},
@@ -725,7 +725,7 @@ if (Prefs.iomatrix_colormap == n) { sz = sizeof(colors##n)/sizeof(*colors0); cde
     int j;
     for (j=i0; j <= MIN(i1,CMAPSZ-1); ++j) {
       float alpha = (j-i0+.5)/(float)(i1-i0);
-      m->p[j] = 
+      m->p[j] =
         (MIN((int)(r1*(1-alpha) + alpha*r2),255)<<16) +
         (MIN((int)(g1*(1-alpha) + alpha*g2),255)<<8) +
         (MIN((int)(b1*(1-alpha) + alpha*b2),255));
@@ -736,7 +736,7 @@ if (Prefs.iomatrix_colormap == n) { sz = sizeof(colors##n)/sizeof(*colors0); cde
 
 unsigned getpos(const char *pp) {
   char p[2];
-  unsigned v = AL_NONE, i;  
+  unsigned v = AL_NONE, i;
   if (!pp || !pp[0]) return AL_NONE;
   if (strlen(pp) > 2) { fprintf(stderr, "invalid position specification: '%s'\n", pp); exit(1); }
   strncpy(p,pp,2);
@@ -747,7 +747,7 @@ unsigned getpos(const char *pp) {
     else if (p[i] == 't') { v |= AL_TOP; }
     else if (p[i] == 'b') { v |= AL_BOTTOM; }
     else if (p[i] == 'c') {
-      if (v & (AL_LEFT | AL_RIGHT | AL_HCENTER)) v |= AL_VCENTER; else v |= AL_HCENTER; 
+      if (v & (AL_LEFT | AL_RIGHT | AL_HCENTER)) v |= AL_VCENTER; else v |= AL_HCENTER;
     } else {
       fprintf(stderr, "unknown position specifier: '%c'\n", p[i]); exit(1);
     }
@@ -781,7 +781,7 @@ void init_prefs(int argc, char **argv) {
 #ifndef GKRELLM
 void parse_options(int argc, char **argv) {
   int d_opt_used = 0;
-  enum { OPT_DISPLAY=1, OPT_SMALLFONT, OPT_BIGFONT, OPT_FONTPATH, 
+  enum { OPT_DISPLAY=1, OPT_SMALLFONT, OPT_BIGFONT, OPT_FONTPATH,
          OPT_NOSWAP, OPT_NOIO, OPT_NOLEDS, OPT_HDLIST, OPT_THROUGHPUT, OPT_32, OPT_56, OPT_48 };
   static struct option long_options[] = {
     {"help",0,0,'h'},
@@ -806,7 +806,7 @@ void parse_options(int argc, char **argv) {
     {NULL,0,0,0}
   };
   int long_options_index;
-  const char *help = 
+  const char *help =
     "wmhdplop " VERSION " - monitor hard-drive (or partition) activity\n"
     "A recent kernel is required (>2.4.20)\n"
     "Usage: wmhdplop [options]\n"
@@ -836,7 +836,7 @@ void parse_options(int argc, char **argv) {
     "                    * Arial_Black/10, FreeSansBold/11, VeraMoBd/9\n"
     "                    * Vera/7, FreeSans/7, Trebuchet_MS/7\n"
     "  -c n, --colormap=n\n"
-    "                  select colormap number n\n" 
+    "                  select colormap number n\n"
     "  --hdlist[=pos]  hide completely the list of drives with leds and temperatures (if no position given)\n"
     "                  or change its location (default: 'B'). Possible positions are: 't','b','l','bl','bc','br',...\n"
     "                  (t=top, b=bottom, l=left, r=right, c=centered, etc)\n"
@@ -859,7 +859,7 @@ void parse_options(int argc, char **argv) {
       break;
     switch (c) {
       case ':':
-      case '?': 
+      case '?':
         exit(1);
       case OPT_DISPLAY:
         Prefs.xprefs.flags |= DOCKPREF_DISPLAY; Prefs.xprefs.display = strdup(optarg);
@@ -932,7 +932,7 @@ void parse_options(int argc, char **argv) {
           assert(optarg);
           if (p) *p++ = 0;
           BLAHBLAH(1,printf("adding device %s to monitored disc list\n",optarg));
-          if (add_device_by_name(optarg, p) != 0) 
+          if (add_device_by_name(optarg, p) != 0)
             fprintf(stderr, "Warning: device %s not found or not recognized -- try option -v to get additionnal information\n", optarg);
           d_opt_used = 1;
         } break;
@@ -965,10 +965,10 @@ void init_fonts(App *app) {
     imlib_context_set_font(app->smallfont); imlib_free_font(); app->smallfont = NULL;
   }
   app->bigfont = load_font(Prefs.bigfontname, bigfontlist);
-  if (app->bigfont) 
+  if (app->bigfont)
     app->current_bigfont_name = strdup(dockimlib2_last_loaded_font());
   app->smallfont = load_font(Prefs.smallfontname, smallfontlist);
-  if (app->smallfont) 
+  if (app->smallfont)
     app->current_smallfont_name = strdup(dockimlib2_last_loaded_font());
 }
 
@@ -999,7 +999,7 @@ int hdplop_main(int width, int height, GdkDrawable *gkdrawable)
 #else
   app->dock = dockimlib2_gkrellm_setup(0, 0, width, height, &Prefs.xprefs, gkdrawable);
 #endif
-  app->bigfont = app->smallfont = NULL; 
+  app->bigfont = app->smallfont = NULL;
   app->current_bigfont_name = app->current_smallfont_name = NULL;
   app->reshape_cnt = 0;
   if (find_id(-1,0) == 0) {
@@ -1034,7 +1034,7 @@ int hdplop_main(int width, int height, GdkDrawable *gkdrawable)
   BLAHBLAH(1, {
       DiskList *dl = first_dev_in_list();
       for ( ; dl; dl=dl->next) {
-        printf("Monitored: %s (%s) major=%d, minor=%d is_partition=%d\n", 
+        printf("Monitored: %s (%s) major=%d, minor=%d is_partition=%d\n",
                dl->dev_path, dl->name, dl->major, dl->minor, is_partition(dl->major,dl->minor));
       }
     });
diff --git a/wmhdplop.h b/wmhdplop.h
index b105684..7dd9520 100644
--- a/wmhdplop.h
+++ b/wmhdplop.h
@@ -42,7 +42,7 @@ typedef struct {
   char *current_bigfont_name, *current_smallfont_name;
   unsigned update_display_delay_ms;
   unsigned update_stats_mult;
-  
+
   unsigned char swap_matrix_luminosity, swap_matrix_lighting;
 
   SwapMatrix sm;
@@ -51,7 +51,7 @@ typedef struct {
   int nb_hd, nb_dev;
   enum {HD_ACTIVE, HD_STANDBY, HD_SLEEP, HD_UNKNOWN} *disk_power_mode;
   int *disk_temperature;
-  
+
   int filter_hd, filter_part;
   int displayed_hd_changed;
   int reshape_cnt;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmhdplop.git



More information about the Pkg-wmaker-commits mailing list