update from Han

1 files changed, 10 insertions, 5 deletions

diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu
index 3e55e6c..b8a3bd3 100755
--- a/util/fluxbox-generate_menu
+++ b/util/fluxbox-generate_menu
@@ -22,7 +22,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-# $Id: fluxbox-generate_menu,v 1.26 2003/02/25 07:44:16 fluxgen Exp $
+# $Id: fluxbox-generate_menu,v 1.27 2003/04/08 09:39:37 fluxgen Exp $
 
 #
 # Portability notes:
@@ -485,7 +485,7 @@ HOMEPAGE="fluxbox.org"
 USERMENU="${HOME}/.fluxbox/usermenu"
 
 # Read the menuconfig file if it exists or else create it.
-if [ -e ${HOME}/.fluxbox/menuconfig ];then
+if [[ -e ${HOME}/.fluxbox/menuconfig ]];then
       . ${HOME}/.fluxbox/menuconfig
 else
     if [ ! "$WHOAMI" = root ];then # this is only for users.
@@ -702,14 +702,19 @@ append_submenu "${NETMENU}"
     append_menu_end
 
     append_submenu IRC
-        normal_find xchat
+        normal_find xchat ksirc
         find_it irssi       append "[exec]   (irssi) {${DEFAULT_TERM} -e irssi}"
         find_it BitchX      append "[exec]   (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \
           find_it bitchx    append "[exec]   (BitchX) {${DEFAULT_TERM} -e bitchx -N}"
         find_it ircii       append "[exec]   (ircii) {${DEFAULT_TERM} -e ircii -s}"
     append_menu_end
 
+    append_submenu P2P
+        normal_find gtk-gnutella lopster
+    append_menu_end
+
     normal_find gftp pan
+
 append_menu_end
 
 
@@ -733,7 +738,7 @@ append_submenu "${MULTIMEDIAMENU}"
 
        append_submenu "${MUSICMENU}"
                normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix grecord \
-                   kmidi xplaycd soundtracker grip easytag lopster audacity
+                   kmidi xplaycd soundtracker grip easytag audacity zinf
                find_it cdcd        append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
                find_it cplay       append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
                find_it alsamixer   append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"
@@ -765,7 +770,7 @@ append_submenu "${GAMESMENU}"
         gnect mahjongg gnomine gnome-stones gnometris gnotravex \
         gnotski iagno knights eboard xboard freecell pysol \
         gtali tuxracer xpenguins xsnow xeyes xpenguins \
-        quake2 quake3 skoosh same-gnome enigma
+        quake2 quake3 skoosh same-gnome enigma xbill
 append_menu_end
 
 # gnome menu