diff -Naur loadapplet-aw-0.2.7-1/ChangeLog loadapplet-aw-0.2.7-2/ChangeLog --- loadapplet-aw-0.2.7-1/ChangeLog 2006-02-27 23:49:44.000000000 +0100 +++ loadapplet-aw-0.2.7-2/ChangeLog 2006-03-02 01:03:38.285031000 +0100 @@ -1,3 +1,7 @@ +2006-02-28 Armin Warda + + * fixed a stupid swapname == NULL bug + 2006-02-26 Armin Warda * Check if swapname is set diff -Naur loadapplet-aw-0.2.7-1/debian/changelog loadapplet-aw-0.2.7-2/debian/changelog --- loadapplet-aw-0.2.7-1/debian/changelog 2006-02-27 23:49:28.000000000 +0100 +++ loadapplet-aw-0.2.7-2/debian/changelog 2006-03-02 01:04:12.795031000 +0100 @@ -1,3 +1,9 @@ +load-plugin-aw (0.2.7-2) unstable; urgency=low + + * fixed a stupid swapname == NULL bug + + -- Armin Warda Fri, 28 Feb 2006 21:44:00 +0200 + load-plugin-aw (0.2.7-1) unstable; urgency=low * Check if swapname is set diff -Naur loadapplet-aw-0.2.7-1/load-plugin.c loadapplet-aw-0.2.7-2/load-plugin.c --- loadapplet-aw-0.2.7-1/load-plugin.c 2006-02-28 00:32:41.000000000 +0100 +++ loadapplet-aw-0.2.7-2/load-plugin.c 2006-03-02 01:10:53.015031000 +0100 @@ -153,7 +153,7 @@ if (! fgets(read_buffer, MAX_READ_CHARS, fin)) /* skip 1st line */ return FALSE; while (fgets(read_buffer, MAX_READ_CHARS, fin)) { - if (read_buffer) { + if (read_buffer && swapname) { sscanf(read_buffer, "%s %s %s %d", activeswapname, dummy, dummy, &swapused); if (strncmp(activeswapname, swapname, MAX_SWAPNAME) == 0) return TRUE; @@ -334,7 +334,7 @@ GtkWidget *confirm; gint result; - if (strncmp(swapname, "", 1) != 0) + if (swapname && *swapname) { if (swapisactive()) sprintf(label, "/usr/bin/sudo /sbin/swapoff %s", swapname); @@ -536,7 +536,7 @@ gtk_menu_shell_append(GTK_MENU_SHELL(info->menu), info->menu_separator); /* Swap */ - if (strncmp(swapname, "", 1) != 0) { + if (swapname && *swapname) { if (swapisactive()) sprintf(label, "swapoff %s (%d MB used)", swapname, (swapused+512)/1024); else