[Xfce4-commits] <xfce4-mount-plugin:master> Updates for 0.6.0

Landry Breuil noreply at xfce.org
Tue Apr 17 10:30:01 CEST 2012 

Updating branch refs/heads/master
         to 720bdcaa7bda376f035ed079c8567e8d15ce006b (commit)
       from 1080184fee1e10750c950284ba30e0e85a835ede (commit)

commit 720bdcaa7bda376f035ed079c8567e8d15ce006b
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Apr 17 10:24:48 2012 +0200

    Updates for 0.6.0
    
    - dump handwritten ChangeLog into NEWS, and generate a new one from git
    - update README/TODO

 ChangeLog       |   93 ----------------------------------------------
 Makefile.am     |    9 +++-
 NEWS            |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 README          |   20 +++------
 TODO            |   18 ---------
 configure.ac.in |    9 ++--
 6 files changed, 118 insertions(+), 141 deletions(-)

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 23a5ce6..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,93 +0,0 @@
-18 january 2009
-- Fixed crash when not being able to read fstab; showing notification dialog
-and allowing to continue regularly
-- Fixed unmount problem with sshfs
-
-27 october 2008
-- New xfce-style header
-
-19 may 2008 - starting version 0.5.6
-- make labels in mount menu exactly as wide as necessary
-
-17 may 2008 - addition to version 0.5.5
-- updated German translation
-- allow UUID device points
-
-16 february 2008 - version 0.5.5
-- added option to exclude device names and only show mount points
-- changed some code for the LVM renaming
-
-23 september 2007 - version 0.5.4
-- new language pt_BR
-- dynamic handling of USB devices and perhaps others
-- LVMs are abbreviated
-- changed a little bit the menu appearance
-
-04 july 2007 - version 0.5.3
-- fixed another broken string
-- added language "nb"
-- added cifs to list of network filesystems
-
-05 may 2007 - version 0.5.2 beginning...
-- fixed broken string, thus breaking the translations...
-- fixed hungarian translation using '\ ' for unknown reasons, which is invalid
-   escape sequence.
-
-02 march 2007 - version 0.5.1
-- added "NULL" to g_strconcat -> prevents segfault
-
-01 march 2007 - version 0.5.0
-- removed bug with mount points containing ugly spaces
-- removed compilation warnings
-
-01 march 2007 - version 0.5.0beta
-- testing pre-release
-
-28 february 2007 - version 0.5.0alpha
-- exclusion of file systems
-- new translation: ukrainian
-
-25 february 2007 - version pre 0.5.0
-- new settings dialog
-- CD eject option
-
-18 september 2005 - version 0.3.2
-- ukrainian tranlation
-- russian translation
-
-17 september 2005 - version 0.3.1
-- corrected some wrong settings
-- hungarian translation
-
-17 september 2005 - version 0.3
-- now maintained by Fabian Nowak <timystery at arcor.de>
-- basic translation possibilities added
-- german tranlsaation added
-
-5 june 2005 - version 0.3
-this third release brings out :
--a brighter display and panel integration.
--corrected bug in free space calculation (sorry)
--mount in background (I use the exec_silent function so the panel execute the mount command when not busy)
--the new settings window allow you to define a command to be run on a succesfull mount of device. The command is executed by a call to exec_silent wich argument is : bash -c "mount /path/to/mount_point && your_command /path/to/mount_point". You just have to specify the correct command with options in the settings and the plugin adds the /path/to/mount_point accordingly. I just tested it with "konqueror", send me reports for bugs...
-
-
-14 april 2005
-
-this second release only changes a few things in the plugin :
-- the list of devices is now dynamic, it gets updated from /etc/fstab entries on each refresh.
-- the display of devices is clearer although the possibility of adaptating it to your wishes is not available yet. sorry.
-- the problem with duplicated device entries in the first release has been corrected in an ugly way. The plugin now compares data from /etc/fstab and data from /etc/mtab using the "mount point" field instead of the "device name" field.
-- the mount command executed by the plugin now works like a "mount /path/to/mount_point" instead of "mount /dev/mydevice", makes things clearer I though.
-
-1 march 2005
-
-This is the first release of xfce4-mount-plugin. this little plugin behaves like the "kwikdisk - removable media utility" shipped with KDE.
-Press it and it displays a list of items representing your various devices. If you click on an unmounted devices it will mount it and vice versa. There is no warning in case a device can't be mounted or unmounted.
-The plugin displays various information on each device :
-"device name" > "mount point" ["used size"/"total size"] "available size" free
-and an obvious progress bar
-
-BUG
-The main bug relies in the way the plugin gather information on your devices. It builds a list of devices from your /etc/fstab (using setfsent() and getfsent() ) and compares it to the list of actually mounted devices (ie same data as the df command, using setmntent() and getmntent() ). New entries are created for new devices not included in the static device list gathered from /etc/fstab. The device names returned by getfsent and getmntent can be different. for example getfsent will return a device named "/dev/discs/disc0/part3" and getmntent will return a device named "/dev/hda3", the plugin will therefore create 2 entries for the same device. and things get confused, you have two entries for the same device, one is mounted the other is not...
-a workaround could be to rewrite your /etc/fstab so that the devices names are the same as the output of the "df" command...
diff --git a/Makefile.am b/Makefile.am
index 78171a0..ca82eac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,12 @@ distcheck-bz2: distcheck
 	zcat $(PACKAGE)-$(VERSION).tar.gz | \
 	  bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
-rpm: dist
-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
-	@rm -f $(PACKAGE)-$(VERSION).tar.gz
+ChangeLog: Makefile
+	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
+	&& mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+	|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
 
 EXTRA_DIST =                     			\
 	AUTHORS									\
diff --git a/NEWS b/NEWS
index 109ceaf..3eea814 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,103 @@
------ 2007-09-16 21:32 GMT -----
-Version 0.5.4 now detects automatically mounted devices.
-Note that for unmounting  them, you might need to setup 
-special commands, like "pmount", or "sudo umount".
+17 april 2012 - version 0.6.0
+- port to panel 4.9
+- port to libxfce4ui
+- build the plugin as a module
+- add support for *BSDs through getmntinfo()
+- use standard icon names, drop old unused icons
+- add a checkbox option to use sudo
+- rewrite config saving/loading (bug #7631)
+- general cleanup
 
-Also does it automatically map the rather long name
-"/dev/mapper/logvol1/volume2" to "LVM 1:2". Currently,
-you cannot disable this behavior, as its is more than 
-strongly recommended. Upon thousands of requests, I
-might consider adding another switch in the already 
-rather big options dialog.
+18 january 2009
+- Fixed crash when not being able to read fstab; showing notification dialog
+and allowing to continue regularly
+- Fixed unmount problem with sshfs
 
+27 october 2008
+- New xfce-style header
 
+19 may 2008 - starting version 0.5.6
+- make labels in mount menu exactly as wide as necessary
+
+17 may 2008 - addition to version 0.5.5
+- updated German translation
+- allow UUID device points
+
+16 february 2008 - version 0.5.5
+- added option to exclude device names and only show mount points
+- changed some code for the LVM renaming
+
+23 september 2007 - version 0.5.4
+- new language pt_BR
+- dynamic handling of USB devices and perhaps others
+- LVMs are abbreviated
+- changed a little bit the menu appearance
+
+04 july 2007 - version 0.5.3
+- fixed another broken string
+- added language "nb"
+- added cifs to list of network filesystems
+
+05 may 2007 - version 0.5.2 beginning...
+- fixed broken string, thus breaking the translations...
+- fixed hungarian translation using '\ ' for unknown reasons, which is invalid
+   escape sequence.
+
+02 march 2007 - version 0.5.1
+- added "NULL" to g_strconcat -> prevents segfault
+
+01 march 2007 - version 0.5.0
+- removed bug with mount points containing ugly spaces
+- removed compilation warnings
+
+01 march 2007 - version 0.5.0beta
+- testing pre-release
+
+28 february 2007 - version 0.5.0alpha
+- exclusion of file systems
+- new translation: ukrainian
+
+25 february 2007 - version pre 0.5.0
+- new settings dialog
+- CD eject option
+
+18 september 2005 - version 0.3.2
+- ukrainian tranlation
+- russian translation
+
+17 september 2005 - version 0.3.1
+- corrected some wrong settings
+- hungarian translation
+
+17 september 2005 - version 0.3
+- now maintained by Fabian Nowak <timystery at arcor.de>
+- basic translation possibilities added
+- german tranlsaation added
+
+5 june 2005 - version 0.3
+this third release brings out :
+-a brighter display and panel integration.
+-corrected bug in free space calculation (sorry)
+-mount in background (I use the exec_silent function so the panel execute the mount command when not busy)
+-the new settings window allow you to define a command to be run on a succesfull mount of device. The command is executed by a call to exec_silent wich argument is : bash -c "mount /path/to/mount_point && your_command /path/to/mount_point". You just have to specify the correct command with options in the settings and the plugin adds the /path/to/mount_point accordingly. I just tested it with "konqueror", send me reports for bugs...
+
+
+14 april 2005
+
+this second release only changes a few things in the plugin :
+- the list of devices is now dynamic, it gets updated from /etc/fstab entries on each refresh.
+- the display of devices is clearer although the possibility of adaptating it to your wishes is not available yet. sorry.
+- the problem with duplicated device entries in the first release has been corrected in an ugly way. The plugin now compares data from /etc/fstab and data from /etc/mtab using the "mount point" field instead of the "device name" field.
+- the mount command executed by the plugin now works like a "mount /path/to/mount_point" instead of "mount /dev/mydevice", makes things clearer I though.
+
+1 march 2005
+
+This is the first release of xfce4-mount-plugin. this little plugin behaves like the "kwikdisk - removable media utility" shipped with KDE.
+Press it and it displays a list of items representing your various devices. If you click on an unmounted devices it will mount it and vice versa. There is no warning in case a device can't be mounted or unmounted.
+The plugin displays various information on each device :
+"device name" > "mount point" ["used size"/"total size"] "available size" free
+and an obvious progress bar
+
+BUG
+The main bug relies in the way the plugin gather information on your devices. It builds a list of devices from your /etc/fstab (using setfsent() and getfsent() ) and compares it to the list of actually mounted devices (ie same data as the df command, using setmntent() and getmntent() ). New entries are created for new devices not included in the static device list gathered from /etc/fstab. The device names returned by getfsent and getmntent can be different. for example getfsent will return a device named "/dev/discs/disc0/part3" and getmntent will return a device named "/dev/hda3", the plugin will therefore create 2 entries for the same device. and things get confused, you have two entries for the same device, one is mounted the other is not...
+a workaround could be to rewrite your /etc/fstab so that the devices names are the same as the output of the "df" command...
diff --git a/README b/README
index 9d94d2e..655f135 100644
--- a/README
+++ b/README
@@ -1,15 +1,9 @@
-# ========================================================== #
-# Version 0.5.5 for Xfce Panel 4.4.0 and higher             #
-# Ported and maintained by Fabian Nowak <timystery at arcor.de> #
-# ========================================================== #
+# ================================================ #
+# Version 0.6.0 for Xfce Panel 4.8.0 and higher    #
+# Ported and maintained by Fabian Nowak and others #
+# ================================================ #
 
-###################################
-#
-# this plugin needs gtk 2.6
-#
-###################################
-
-xfce4-mount-plugin - version 0.5.5
+xfce4-mount-plugin - version 0.6.0
 
 This little plugin behaves like the "kwikdisk - removable media utility" shipped
 with KDE.
@@ -26,12 +20,12 @@ and an obvious progress bar.
 The plugin works in a very simple way. It builds a list of devices from your 
 /etc/fstab (using setfsent() and getfsent() ) and gets device stats from the 
 list of mounted devices (i.e. same data as the 'df' command), using setmntent()
-and getmntent().
+and getmntent(). On *BSD systems it uses getmntinfo().
 For mouting a device, the plugin simply runs a "mount /mount_point/ " command if
 no other command is explicitly specified in the options dialog.
 
 Acknowledgements go to the following people for several major or minor reasons,
-mostly for nice ideas and fea tures, but also for bugfixes and other stuff:
+mostly for nice ideas and features, but also for bugfixes and other stuff:
 
  - The one guy with the "no device names" patch
  - Christoph Kühne
diff --git a/TODO b/TODO
index cfa8c61..e254491 100644
--- a/TODO
+++ b/TODO
@@ -2,22 +2,4 @@ Listen to HAL/Udev for new devices. Code is already in places-plugin, in xfdeskt
 
 Use fusermount -u for FUSE file systems.
 
-Have a look at the icon stuff: when changing from binary install to custom and thus from /usr to /ur/local, no image is shown at all; can't find the nice image in the filesystem easily. Perhaps simply test for /usr/share und /usr/local/share/ and some /opt/share/ paths in this order, and then display nothing at all; or search relative to the plugin path.
-
 Add notification messages instead of popups when removing the device was successful.
-
-Add more translations from all over the world ;-)
-
-To add your language, simply copy po/xfce4-mount-plugin.pot to 
-po/languagecode.po and edit ALL the msgstr fields in your language with an 
-UTF-8 capable editor. You can also use tools such as "msginit". 
-
-Try to also add your name and email to the information at the beginning of the 
-file.
-
-When you've finished translating, send the gzipped PO file to 
-<timystery at arcor.de> or, even better, sign up at xfce-i18n at xfce.org.
-
-Thanks, Fabian Nowak and all other users speaking your newly translated 
-language!
-
diff --git a/configure.ac.in b/configure.ac.in
index 349e869..6202646 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,13 +4,14 @@ dnl xfce4-mount-plugin - Mount plugin for xfce4-panel
 dnl
 dnl 2003, 2004 Benedikt Meurer <benny at xfce.org>
 dnl 2005-2008 Fabian Nowak <timystery at arcor.de>
+dnl 2012 Landry Breuil <landry at xfce.org>
 dnl
-dnl for Xfce4-panel 4.3 and higher only!
+dnl for Xfce4-panel 4.8 and higher only!
 
 m4_define([mount_version_major], [0])
-m4_define([mount_version_minor], [5])
-m4_define([mount_version_micro], [7])
-m4_define([mount_version_tag], [git]) # Leave empty for releases
+m4_define([mount_version_minor], [6])
+m4_define([mount_version_micro], [0])
+m4_define([mount_version_tag], []) # Leave empty for releases
 m4_define([mount_version_build], [@REVISION@])
 m4_define([mount_version], [mount_version_major().mount_version_minor().mount_version_micro()ifelse(mount_version_tag(), [], [], [mount_version_tag()-mount_version_build()])])

More information about the Xfce4-commits mailing list