diff -urN LinNeighborhood-0.6.5/configure.in LinNeighborhood-0.6.5-new/configure.in --- LinNeighborhood-0.6.5/configure.in 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/configure.in 2004-08-31 15:08:14.000000000 +0100 @@ -31,7 +31,9 @@ AC_SUBST(iconsdir) dnl gtk+ libraries -AM_PATH_GTK(1.2.0) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.3.1) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) # posix thread libraries required diff -urN LinNeighborhood-0.6.5/missing LinNeighborhood-0.6.5-new/missing --- LinNeighborhood-0.6.5/missing 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/missing 2004-08-27 22:10:38.000000000 +0100 @@ -1,7 +1,11 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard , 1996. + +scriptversion=2003-09-02.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +22,48 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -35,6 +76,7 @@ Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +85,17 @@ automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing $scriptversion (GNU Automake)" ;; -*) @@ -58,55 +104,105 @@ exit 1 ;; - aclocal) + aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in` - if test -z "$files"; then - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in` - test -z "$files" || files="$files.in" - else - files=`echo "$files" | sed -e 's/:/ /g'` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 fi - test -z "$files" && files="config.h.in" - touch $files - ;; - automake) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - find . -type f -name Makefile.am -print \ - | sed 's/^\(.*\).am$/touch \1.in/' \ - | sh + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi ;; bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." @@ -136,7 +232,7 @@ lex|flex) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." @@ -157,9 +253,39 @@ fi ;; + help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if +WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious call might also be the consequence of using a buggy \`make' (AIX, @@ -173,12 +299,51 @@ touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 @@ -186,3 +351,10 @@ esac exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff -urN LinNeighborhood-0.6.5/src/Makefile.am LinNeighborhood-0.6.5-new/src/Makefile.am --- LinNeighborhood-0.6.5/src/Makefile.am 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/Makefile.am 2004-08-31 14:58:35.000000000 +0100 @@ -12,3 +12,5 @@ LIBS = @GTK_LIBS@ -lpthread EXTRA_DIST = picture + +AM_CFLAGS = -O2 -g -Wall -Werror -DGTK_ENABLE_BROKEN \ No newline at end of file diff -urN LinNeighborhood-0.6.5/src/browsewrap.c LinNeighborhood-0.6.5-new/src/browsewrap.c --- LinNeighborhood-0.6.5/src/browsewrap.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/browsewrap.c 2004-08-30 21:41:39.000000000 +0100 @@ -352,7 +352,7 @@ g_free(browse_info); } -void GetSMBMachines_done ( char *group_name, +void GetSMBMachines_done ( const char *group_name, GSList *machinecommentlist, MACHINES_BROWSE_INFO *browse_info, GetSMBStateType state ) @@ -479,6 +479,8 @@ static void add_groupmasters_enumerate (group_struct *group, gpointer data) { + data = data; + if ( group != NULL ) { /* add additional group masters */ @@ -517,7 +519,7 @@ /* return value != 0 : browse was started = 0 : browse wasn't started */ -static void browse_groups_start ( char *master_browser, +static void browse_groups_start ( const char *master_browser, char first_master, BROWSE_MODE mode, browse_groups_callback callback ) @@ -645,7 +647,7 @@ browse_shares(machine->group->name, machine->name, mode); } -static void browse_machines_done ( char *group_name, +static void browse_machines_done ( const char *group_name, GSList * machinecommentlist, BROWSE_MODE mode) { @@ -673,14 +675,14 @@ } } -static void browse_machines_start ( char *group_name, - char *master_browser, +static void browse_machines_start ( const char *group_name, + const char *master_browser, BROWSE_MODE mode, browse_machines_callback callback ) { MACHINES_BROWSE_INFO *browse_info; BROWSE_LIST_ENTRY *entry; - char *usr, *passwd, *domain; + const char *usr, *passwd, *domain; int port = -1; usr = cempty; @@ -742,7 +744,7 @@ } /* 1 = browse started, 0 = not started */ -unsigned char browse_machines ( char *groupname, +unsigned char browse_machines ( const char *groupname, BROWSE_MODE mode ) { group_struct *group; @@ -781,10 +783,10 @@ /* ------------------------------------------------------------------------- */ -static void browse_shares_done ( char *group_name, - char *machine_name, - char *user, - char *password, +static void browse_shares_done ( const char *group_name, + const char *machine_name, + const char *user, + const char *password, MACHINEINFO_STRUCT *machineinfo, GSList *sharecommenttypelist, BROWSE_MODE mode) @@ -818,16 +820,16 @@ gui_set_cursor(cursor_normal); } -static void browse_shares_start ( char *group_name, - char *machine_name, - char *domain_name, - char *ip, +static void browse_shares_start ( const char *group_name, + const char *machine_name, + const char *domain_name, + const char *ip, BROWSE_MODE mode, browse_shares_callback callback ) { SHARES_BROWSE_INFO *browse_info; BROWSE_LIST_ENTRY *entry; - char *usr, *passwd, *domain; + const char *usr, *passwd, *domain; int port = -1; usr = cempty; @@ -888,7 +890,7 @@ } } -void browse_shares ( char *groupname, char *machinename, +void browse_shares ( const char *groupname, const char *machinename, BROWSE_MODE mode) { group_struct *g_struct; @@ -944,13 +946,15 @@ /* ------------------------------------------------------------------------- */ -static void browse_path_done ( char *group_name, - char *machine_name, - char *share_name, - char *path_name, +static void browse_path_done ( const char *group_name, + const char *machine_name, + const char *share_name, + const char *path_name, GSList *files, BROWSE_MODE mode) { + mode = mode; + /* add files list to window(s) */ gui_set_files(group_name, machine_name, share_name, path_name, files); @@ -963,19 +967,19 @@ gui_set_cursor(cursor_normal); } -static void browse_path_start ( char *group, - char *machine, - char *share, - char *path, - char *ip, - char *user, - char *password, +static void browse_path_start ( const char *group, + const char *machine, + const char *share, + const char *path, + const char *ip, + const char *user, + const char *password, BROWSE_MODE mode, browse_path_callback callback ) { PATH_BROWSE_INFO *browse_info; BROWSE_LIST_ENTRY *entry; - char *usr, *passwd, *domain; + const char *usr, *passwd, *domain; char share_path[MAXSHAREPATHL+1]; usr = cempty; diff -urN LinNeighborhood-0.6.5/src/browsewrap.h LinNeighborhood-0.6.5-new/src/browsewrap.h --- LinNeighborhood-0.6.5/src/browsewrap.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/browsewrap.h 2004-08-30 21:36:50.000000000 +0100 @@ -31,22 +31,22 @@ typedef void (*browse_groups_callback)(GSList *groupmasterlist, BROWSE_MODE mode); -typedef void (*browse_machines_callback)( char *group_name, +typedef void (*browse_machines_callback)(const char *group_name, GSList * machinecommentlist, BROWSE_MODE mode); -typedef void (*browse_shares_callback)(char *group_name, - char *machine_name, - char *user, - char *password, +typedef void (*browse_shares_callback)(const char *group_name, + const char *machine_name, + const char *user, + const char *password, MACHINEINFO_STRUCT *machineinfo, GSList *sharecommenttypelist, BROWSE_MODE mode); -typedef void (*browse_path_callback)( char *group_name, - char *machine_name, - char *share_name, - char *path_name, +typedef void (*browse_path_callback)( const char *group_name, + const char *machine_name, + const char *share_name, + const char *path_name, GSList *files, BROWSE_MODE mode); @@ -144,7 +144,7 @@ GROUPS_BROWSE_INFO *browse_info, GetSMBStateType state ); -extern void GetSMBMachines_done ( char *group_name, +extern void GetSMBMachines_done ( const char *group_name, GSList *machinecommentlist, MACHINES_BROWSE_INFO *browse_info, GetSMBStateType state ); @@ -182,10 +182,10 @@ /* browsing functions */ extern void browse_groups ( BROWSE_MODE mode ); -extern unsigned char browse_machines ( char *groupname, +extern unsigned char browse_machines ( const char *groupname, BROWSE_MODE mode); -extern void browse_shares ( char *groupname, char *machinename, +extern void browse_shares ( const char *groupname, const char *machinename, BROWSE_MODE mode); extern void browse_path (share_window_struct *sw, BROWSE_MODE mode); diff -urN LinNeighborhood-0.6.5/src/data.c LinNeighborhood-0.6.5-new/src/data.c --- LinNeighborhood-0.6.5/src/data.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/data.c 2004-08-31 14:53:51.000000000 +0100 @@ -181,7 +181,7 @@ } /* return value: 1 -> entry deleted, 0 -> not deleted */ -static unsigned char mount_list_delete_by_mountpoint (char *mountpoint) +static unsigned char mount_list_delete_by_mountpoint (const char *mountpoint) { mount_struct *mount; @@ -230,7 +230,7 @@ /* ---------- */ /* return value: 1 -> mountpoint is in list, 0 -> not in list */ -unsigned char mount_list_in_list_mountpoint (char *mountpoint) +unsigned char mount_list_in_list_mountpoint (const char *mountpoint) { if ( mount_list_search_by_mountpoint(mountpoint) != NULL ) return 1; @@ -240,7 +240,7 @@ /* searches a mount entry by its mountpoinz, returns a pointer to its structure on success */ -mount_struct *mount_list_search_by_mountpoint (char *mountpoint) +mount_struct *mount_list_search_by_mountpoint (const char *mountpoint) { mount_struct *ret, *temp; GSList *templist; @@ -267,7 +267,7 @@ /* searches a mount entry by its machine name + share name, returns a pointer to its structure on success */ -mount_struct *mount_list_search_by_machine_share (char *machine, char *share) +mount_struct *mount_list_search_by_machine_share (const char *machine, const char *share) { mount_struct *ret, *temp; GSList *templist; @@ -511,7 +511,7 @@ /* searches a memorized mount by its mountpoint, returns a pointer to its structure on success */ -mem_mount_struct *mem_mount_list_search_by_mpoint(char *mountpoint) +mem_mount_struct *mem_mount_list_search_by_mpoint(const char *mountpoint) { mem_mount_struct *ret, *temp; GSList *templist; @@ -609,7 +609,7 @@ /* searches a preferred host by its name, returns a pointer to its structure on success */ -host_struct *host_list_search_by_name(char *name) +host_struct *host_list_search_by_name(const char *name) { host_struct *ret, *temp; GSList *templist; @@ -654,7 +654,7 @@ *masterlist = g_slist_append(*masterlist, master); } -void group_list_master_delete_local (GSList **masterlist, char *name) +void group_list_master_delete_local (GSList **masterlist, const char *name) { group_master_struct *master; @@ -671,7 +671,7 @@ /* searches a group's master browser list for a certain entry, returns the first master if searchname = "" */ -group_master_struct *group_list_master_search_by_name (GSList *masterlist, char *name) +group_master_struct *group_list_master_search_by_name (GSList *masterlist, const char *name) { group_master_struct *ret, *temp; GSList *templist; @@ -780,7 +780,7 @@ } } -void group_list_append_additional_master (char *group_name) +void group_list_append_additional_master (const char *group_name) { group_struct *group; group_master_struct *master; @@ -859,7 +859,7 @@ /* ---------- */ /* searches a group by its name, returns a pointer to its structure on success */ -group_struct *group_list_search_by_name(char *name) +group_struct *group_list_search_by_name(const char *name) { group_struct *ret, *temp; GSList *templist; @@ -970,7 +970,7 @@ } /* reports the number of machines stored in a group */ -guint machine_list_count (char *groupname) +guint machine_list_count (const char *groupname) { group_struct *group; guint iret = 0; @@ -985,7 +985,7 @@ } /* enumerates all stored machines in a group */ -void machine_list_enumerate (char *groupname, machine_enumerate_callback callback, gpointer data) +void machine_list_enumerate (const char *groupname, machine_enumerate_callback callback, gpointer data) { GSList *temp; group_struct *group; @@ -1011,7 +1011,7 @@ /* ---------- */ /* searches a machine by its name, on succes it returns a pointer to its structure */ -machine_struct *machine_list_search_by_name (GSList *machinelist, char *name) +machine_struct *machine_list_search_by_name (GSList *machinelist, const char *name) { machine_struct *ret, *temp; GSList *templist; @@ -1036,7 +1036,7 @@ return ret; } -machine_struct *machine_list_search_by_group_name (char *group, char *machine) +machine_struct *machine_list_search_by_group_name (const char *group, const char *machine) { machine_struct *ret; group_struct *g_struct; @@ -1121,7 +1121,7 @@ } /* reports the number of shares stored in a machine of a group */ -guint share_list_count (char *groupname, char *machinename) +guint share_list_count (const char *groupname, const char *machinename) { group_struct *group; machine_struct *machine; @@ -1158,7 +1158,7 @@ } /* enumerates all stored shares in a group's machine */ -void share_list_enumerate (char *groupname, char *machinename, share_enumerate_callback callback, gpointer data) +void share_list_enumerate (const char *groupname, const char *machinename, share_enumerate_callback callback, gpointer data) { GSList *temp = (GSList*)NULL; group_struct *group; @@ -1204,7 +1204,7 @@ /* ---------- */ /* searches a machine by its name, on succes it returns a pointer to its structure */ -share_struct *share_list_search_by_name (GSList *sharelist, char *name) +share_struct *share_list_search_by_name (GSList *sharelist, const char *name) { share_struct *ret, *temp; GSList *templist; @@ -1231,7 +1231,7 @@ /* searches the structure of the share in a certain machine of a certain group. if group is an empty string (""), it looks for a preferred host */ -share_struct *share_list_search_by_group_machine_name (char *group, char *machine, char *share) +share_struct *share_list_search_by_group_machine_name (const char *group, const char *machine, const char *share) { share_struct *ret; group_struct *g_struct; @@ -1326,7 +1326,7 @@ /* searches a master browser by its name, returns a pointer to its structure on success */ -master_struct *master_list_search_by_name(char *name) +master_struct *master_list_search_by_name(const char *name) { master_struct *ret, *temp; GSList *templist; @@ -1356,7 +1356,7 @@ /* ------------------------------------------------------------------------- */ /* insert a mounted share */ -void data_mount_add (char *service, char *mountpoint) +void data_mount_add (char *service, const char *mountpoint) { mount_struct *mount; char *machine, *share; @@ -1392,7 +1392,7 @@ } } -void data_mount_delete (char *mountpoint) +void data_mount_delete (const char *mountpoint) { data_notify_struct notify; @@ -1410,7 +1410,7 @@ } /* insert a master browser to list */ -void data_master_add (char *name, master_browser_type type) +void data_master_add (const char *name, master_browser_type type) { master_struct *master; data_notify_struct notify; @@ -1440,7 +1440,7 @@ } /* delete a master browser from list */ -void data_master_delete (char *name) +void data_master_delete (const char *name) { master_struct *master; data_notify_struct notify; @@ -1466,7 +1466,7 @@ } /* insert a preferred host to list */ -void data_hosts_add (char *machine, char *group, char *ip, host_type type) +void data_hosts_add (const char *machine, const char *group, const char *ip, host_type type) { host_struct *host; data_notify_struct notify; @@ -1519,7 +1519,7 @@ } /* delete a preferred host from list */ -void data_hosts_delete (char *machine) +void data_hosts_delete (const char *machine) { host_struct *host; data_notify_struct notify; @@ -1546,7 +1546,7 @@ } } -void data_hosts_machineinfo_set (char *machine, MACHINEINFO_STRUCT *machineinfo) +void data_hosts_machineinfo_set (const char *machine, MACHINEINFO_STRUCT *machineinfo) { host_struct *host; @@ -1598,7 +1598,7 @@ /* adds a list of machines to a certain group return: '1' if group exists '0' if not */ -unsigned char data_machines_add (char *group, GSList *machinecommentlist, BROWSE_MODE mode) +unsigned char data_machines_add (const char *group, GSList *machinecommentlist, BROWSE_MODE mode) { group_struct *workgroup; data_notify_struct notify; @@ -1634,7 +1634,7 @@ return 0; } -void data_machines_machineinfo_set (char *group, char *machine, MACHINEINFO_STRUCT *machineinfo) +void data_machines_machineinfo_set (const char *group, const char *machine, MACHINEINFO_STRUCT *machineinfo) { group_struct *workgroup; machine_struct *host; @@ -1663,8 +1663,8 @@ /* adds a list of shares to a certain machine of a group return: '1' if group and machine exists '0' if not */ -unsigned char data_shares_add (char *group, char *machine, - char *user, char *password, GSList * sharecommenttypelist, BROWSE_MODE mode) +unsigned char data_shares_add (const char *group, const char *machine, + const char *user, const char *password, GSList * sharecommenttypelist, BROWSE_MODE mode) { group_struct *workgroup; machine_struct *host; @@ -1702,7 +1702,7 @@ } /* adds a list of shares to a preferred host */ -void data_hosts_shares_add (char *machine, char *user, char *password, GSList * sharecommenttypelist) +void data_hosts_shares_add (const char *machine, const char *user, const char *password, GSList * sharecommenttypelist) { host_struct *host; data_notify_struct notify; @@ -1734,7 +1734,7 @@ /* adds an memorized mount to its list, arglist must be completed with a NULL pointer */ -void data_mem_mount_add (MEM_MOUNT_TYPE type, char *mountpoint, char **arglist) +void data_mem_mount_add (MEM_MOUNT_TYPE type, const char *mountpoint, char **arglist) { mem_mount_struct *mount; int i; @@ -1768,7 +1768,7 @@ } } -void data_mem_mount_delete (char *mountpoint) +void data_mem_mount_delete (const char *mountpoint) { mem_mount_struct *mount; @@ -1786,7 +1786,7 @@ } /* insert a group master browser to list */ -void data_groupmaster_add (char *group, char *name, group_master_type type) +void data_groupmaster_add (const char *group, const char *name, group_master_type type) { group_master_struct *master; data_notify_struct notify; @@ -1820,7 +1820,7 @@ } /* delete a master browser from list */ -void data_groupmaster_delete (char *group, char *name) +void data_groupmaster_delete (const char *group, const char *name) { group_master_struct *master; data_notify_struct notify; @@ -1891,7 +1891,7 @@ to its structure on success. You recursive can get more than one group master by invoking the first time using 'reset = 1' and following 'reset = 0' */ -group_master_struct *groupmaster_list_search_by_workgroup(char *workgroup, unsigned char reset) +group_master_struct *groupmaster_list_search_by_workgroup(const char *workgroup, unsigned char reset) { group_master_struct *ret, *temp; static GSList *templist = NULL; @@ -1920,7 +1920,7 @@ /* searches a groups master browser by its workgroup and name, returns a pointer to its structure on success */ -group_master_struct *groupmaster_list_search_by_workgroup_name (char *workgroup, char *master) +group_master_struct *groupmaster_list_search_by_workgroup_name (const char *workgroup, const char *master) { group_master_struct *ret, *temp; diff -urN LinNeighborhood-0.6.5/src/data.h LinNeighborhood-0.6.5-new/src/data.h --- LinNeighborhood-0.6.5/src/data.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/data.h 2004-08-30 21:37:54.000000000 +0100 @@ -63,72 +63,72 @@ extern void notify_groupmaster_change (); /* mount list functions */ -extern void data_mount_add (char *service, char *mountpoint); -extern void data_mount_delete (char *mountpoint); -extern unsigned char mount_list_in_list_mountpoint (char *mountpoint); +extern void data_mount_add (char *service, const char *mountpoint); +extern void data_mount_delete (const char *mountpoint); +extern unsigned char mount_list_in_list_mountpoint (const char *mountpoint); extern guint mount_list_count (); extern void mount_list_enumerate (mount_enumerate_callback callback, gpointer data); -extern mount_struct *mount_list_search_by_mountpoint (char *mountpoint); -extern mount_struct *mount_list_search_by_machine_share (char *machine, char *share); +extern mount_struct *mount_list_search_by_mountpoint (const char *mountpoint); +extern mount_struct *mount_list_search_by_machine_share (const char *machine, const char *share); #ifndef NO_SMBMOUNT extern void mount_list_retrigger (); #endif /* memorized mounts list functions */ -extern void data_mem_mount_add (MEM_MOUNT_TYPE type, char *mountpoint, char **arglist); -extern void data_mem_mount_delete (char *mountpoint); +extern void data_mem_mount_add (MEM_MOUNT_TYPE type, const char *mountpoint, char **arglist); +extern void data_mem_mount_delete (const char *mountpoint); extern guint mem_mount_list_count (void); extern void mem_mount_list_enumerate (mem_mount_enumerate_callback callback, gpointer data); -extern mem_mount_struct *mem_mount_list_search_by_mpoint(char *mountpoint); +extern mem_mount_struct *mem_mount_list_search_by_mpoint(const char *mountpoint); /* master browser list functions */ -extern void data_master_add (char *name, master_browser_type type); -extern void data_master_delete (char *name); +extern void data_master_add (const char *name, master_browser_type type); +extern void data_master_delete (const char *name); extern guint master_list_count (); extern void master_list_enumerate (master_enumerate_callback callback, gpointer data); -extern master_struct *master_list_search_by_name(char *name); +extern master_struct *master_list_search_by_name(const char *name); /* preferred host list functions */ -extern void data_hosts_add (char *machine, char *group, char *ip, host_type type); -extern void data_hosts_delete (char *machine); +extern void data_hosts_add (const char *machine, const char *group, const char *ip, host_type type); +extern void data_hosts_delete (const char *machine); extern void data_hosts_delete_all (void); -extern void data_hosts_shares_add (char *machine, char *user, char *password, GSList * sharecommenttypelist); -extern void data_hosts_machineinfo_set (char *machine, MACHINEINFO_STRUCT *machineinfo); +extern void data_hosts_shares_add (const char *machine, const char *user, const char *password, GSList * sharecommenttypelist); +extern void data_hosts_machineinfo_set (const char *machine, MACHINEINFO_STRUCT *machineinfo); extern guint host_list_count (void); extern void host_list_enumerate (host_enumerate_callback callback, gpointer data); -extern host_struct *host_list_search_by_name(char *name); +extern host_struct *host_list_search_by_name(const char *name); /* group list functions */ extern void data_groups_add (GSList *groupmasterlist, unsigned char append); extern guint group_list_count (); extern void group_list_enumerate (group_enumerate_callback callback, gpointer data); -extern void group_list_append_additional_master (char *group_name); -extern void group_list_master_delete_local (GSList **masterlist, char *name); -extern group_struct *group_list_search_by_name(char *name); -extern group_master_struct *group_list_master_search_by_name (GSList *masterlist, char *name); +extern void group_list_append_additional_master (const char *group_name); +extern void group_list_master_delete_local (GSList **masterlist, const char *name); +extern group_struct *group_list_search_by_name(const char *name); +extern group_master_struct *group_list_master_search_by_name (GSList *masterlist, const char *name); /* machine list functions */ -extern unsigned char data_machines_add (char *group, GSList *machinecommentlist, BROWSE_MODE mode); -extern void data_machines_machineinfo_set (char *group, char *machine, MACHINEINFO_STRUCT *machineinfo); -extern guint machine_list_count (char *groupname); -extern void machine_list_enumerate (char *groupname, machine_enumerate_callback callback, gpointer data); -extern machine_struct *machine_list_search_by_name (GSList *machinelist, char *name); -extern machine_struct *machine_list_search_by_group_name (char *group, char *machine); +extern unsigned char data_machines_add (const char *group, GSList *machinecommentlist, BROWSE_MODE mode); +extern void data_machines_machineinfo_set (const char *group, const char *machine, MACHINEINFO_STRUCT *machineinfo); +extern guint machine_list_count (const char *groupname); +extern void machine_list_enumerate (const char *groupname, machine_enumerate_callback callback, gpointer data); +extern machine_struct *machine_list_search_by_name (GSList *machinelist, const char *name); +extern machine_struct *machine_list_search_by_group_name (const char *group, const char *machine); extern void machine_list_delete_all (GSList **machinelist); /* share list functions */ -extern unsigned char data_shares_add (char *group, char *machine, char *user, char *password, GSList * sharecommenttypelist, BROWSE_MODE mode); -extern guint share_list_count (char *groupname, char *machinename); -extern void share_list_enumerate (char *groupname, char *mschinename, share_enumerate_callback callback, gpointer data); -extern share_struct *share_list_search_by_group_machine_name (char *group, char *machine, char *share); +extern unsigned char data_shares_add (const char *group, const char *machine, const char *user, const char *password, GSList * sharecommenttypelist, BROWSE_MODE mode); +extern guint share_list_count (const char *groupname, const char *machinename); +extern void share_list_enumerate (const char *groupname, const char *mschinename, share_enumerate_callback callback, gpointer data); +extern share_struct *share_list_search_by_group_machine_name (const char *group, const char *machine, const char *share); /* group master browser functions */ -extern void data_groupmaster_add (char *group, char *name, group_master_type type); -extern void data_groupmaster_delete (char *group, char *name); +extern void data_groupmaster_add (const char *group, const char *name, group_master_type type); +extern void data_groupmaster_delete (const char *group, const char *name); extern guint groupmaster_list_count (); extern void groupmaster_list_enumerate (groupmaster_enumerate_callback callback, gpointer data); -extern group_master_struct *groupmaster_list_search_by_workgroup(char *workgroup, unsigned char reset); -extern group_master_struct *groupmaster_list_search_by_workgroup_name (char *workgroup, char *master); +extern group_master_struct *groupmaster_list_search_by_workgroup(const char *workgroup, unsigned char reset); +extern group_master_struct *groupmaster_list_search_by_workgroup_name (const char *workgroup, const char *master); /* ------------------------------------------------------------------------- */ diff -urN LinNeighborhood-0.6.5/src/define.h LinNeighborhood-0.6.5-new/src/define.h --- LinNeighborhood-0.6.5/src/define.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/define.h 2004-08-29 23:01:03.000000000 +0100 @@ -404,8 +404,8 @@ typedef struct _data_notify_struct { DATA_TYPE dt; - char *group; - char *machine; + const char *group; + const char *machine; gpointer data; } data_notify_struct; diff -urN LinNeighborhood-0.6.5/src/gtk_dialog.c LinNeighborhood-0.6.5-new/src/gtk_dialog.c --- LinNeighborhood-0.6.5/src/gtk_dialog.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_dialog.c 2004-08-30 12:14:49.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "gtk_dialog.h" @@ -263,8 +264,8 @@ gdk_color_alloc(gtk_widget_get_colormap(main_window),&color); gdk_gc_set_foreground(gc,&color); font = gdk_fontset_load ("-*-times-bold-r-*-*-*-120-*-*-*-*-*-*"); - tw = gdk_text_width(font ? font:window->style->font, versionsstr, strlen(versionsstr)); - gdk_draw_text(pixmap,font ? font:window->style->font,gc,178-(tw/2),115, + tw = gdk_text_width(font ?: gtk_style_get_font(window->style), versionsstr, strlen(versionsstr)); + gdk_draw_text(pixmap, font ?: gtk_style_get_font(window->style),gc,178-(tw/2),115, versionsstr,strlen(versionsstr)); if ( font ) gdk_font_unref(font); gdk_gc_unref(gc); @@ -1124,7 +1125,7 @@ GtkWidget *icon_close; GtkWidget *clist_win; - mb_dlg = gtk_window_new(GTK_WINDOW_DIALOG); + mb_dlg = gtk_window_new(GTK_WINDOW_POPUP); gtk_window_set_wmclass(GTK_WINDOW(mb_dlg), "master_browser", "LinNeighborhood"); gtk_window_set_modal(GTK_WINDOW(mb_dlg), TRUE); gtk_window_set_policy(GTK_WINDOW(mb_dlg), 0, 0, 0); @@ -1140,7 +1141,10 @@ gtk_widget_show(vbox); /* button toolbar */ - toolbar = gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); + gtk_box_pack_start( GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); gtk_widget_show(toolbar); @@ -1443,7 +1447,7 @@ } } -static void preferences_dialog_set_string (unsigned char *done_change, char *value, char **old_value, size_t maxlen) +static void preferences_dialog_set_string (unsigned char *done_change, const char *value, char **old_value, size_t maxlen) { static char ctemp[256]; char *ptemp; @@ -1460,7 +1464,7 @@ } } -static void preferences_dialog_set_integer (unsigned char *done_change, char *value_string, int *old_value) +static void preferences_dialog_set_integer (unsigned char *done_change, const char *value_string, int *old_value) { int value; char *ptemp; @@ -1638,7 +1642,7 @@ static void preferences_cmd_argument_callback (GtkWidget *widget, gpointer *data) { - char *header; + const char *header; char *old_value; preferences_argument_count = (int)data; @@ -1719,8 +1723,8 @@ static void copy_fm_pressed (GtkWidget *widget) { GtkWidget *entry; - char *text; - char *command; + const char *text; + const char *command; char *commstring; int len; @@ -2301,7 +2305,7 @@ io_write_mount_script(export_path); } -static void export_mount_script (char *filename) +static void export_mount_script (const char *filename) { string_ncopy(export_path, filename, PATH_LEN); @@ -2387,7 +2391,7 @@ /* -- callback functions for Dialog(s) -- */ -static void add_groupmaster_callback (char *group, char *master) +static void add_groupmaster_callback (const char *group, const char *master) { if ( !groupmaster_list_search_by_workgroup_name(group, master) ) { @@ -2397,7 +2401,7 @@ } } -static void replace_groupmaster_callback (char *group, char *name) +static void replace_groupmaster_callback (const char *group, const char *name) { group_master_struct *master; unsigned char has_changed; @@ -2565,7 +2569,7 @@ GtkWidget *icon_close; GtkWidget *clist_win; - gm_dlg = gtk_window_new(GTK_WINDOW_DIALOG); + gm_dlg = gtk_window_new(GTK_WINDOW_POPUP); gtk_window_set_wmclass(GTK_WINDOW(gm_dlg), "group_master", "LinNeighborhood"); gtk_window_set_modal(GTK_WINDOW(gm_dlg), TRUE); gtk_window_set_policy(GTK_WINDOW(gm_dlg), 0, 0, 0); @@ -2581,7 +2585,10 @@ gtk_widget_show(vbox); /* button toolbar */ - toolbar = gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); + gtk_box_pack_start( GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); gtk_widget_show(toolbar); @@ -2647,7 +2654,7 @@ static void dual_input_ok_cb (GtkWidget *widget, GtkWidget *dlg) { - char *input1, *input2; + const char *input1, *input2; if ( dual_input_callback != NULL ) { @@ -2920,7 +2927,7 @@ if ( cancel_function != NULL ) gtk_signal_connect(GTK_OBJECT(button), "clicked", cancel_function, d_struct); else - gtk_signal_connect(GTK_OBJECT(button), "clicked", dialog_ok_cancel_callback_cancel, d_struct); + gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dialog_ok_cancel_callback_cancel), d_struct); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0); gtk_widget_show(button); diff -urN LinNeighborhood-0.6.5/src/gtk_dialog.h LinNeighborhood-0.6.5-new/src/gtk_dialog.h --- LinNeighborhood-0.6.5/src/gtk_dialog.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_dialog.h 2004-08-27 22:32:17.000000000 +0100 @@ -25,6 +25,7 @@ #include "define.h" +#include /* ------------------------------------------------------------------------- */ @@ -35,7 +36,7 @@ prefhost_struct prefhost; } PREF_MACHINE_DIALOG_STRUCT; -typedef void (*dual_input_ok_callback)(char *input1, char *input2); +typedef void (*dual_input_ok_callback)(const char *input1, const char *input2); typedef struct _DUAL_INPUT_DIALOG_STRUCT { char *title; diff -urN LinNeighborhood-0.6.5/src/gtk_gui.c LinNeighborhood-0.6.5-new/src/gtk_gui.c --- LinNeighborhood-0.6.5/src/gtk_gui.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_gui.c 2004-09-07 21:39:13.000000000 +0100 @@ -189,8 +189,8 @@ } } -void ShowMessageDialog (char *title, - char *text, +void ShowMessageDialog (const char *title, + const char *text, unsigned int buttons, msgdlg_callback callback) { @@ -355,8 +355,8 @@ } } -void TextInputDialog (char *title, - char *text, +void TextInputDialog (const char *title, + const char *text, char *input, int input_maxlen, int w, @@ -450,9 +450,11 @@ gtk_tooltips_force_window(toolbar->tooltips); tooltipsStyle=gtk_style_copy(toolbar->tooltips->tip_window->style); - gdk_font_unref(tooltipsStyle->font); - tooltipsStyle->font = main_window->style->font; - +// gdk_font_unref(tooltipsStyle->font); + gdk_font_unref(gtk_style_get_font(tooltipsStyle)); +// tooltipsStyle->font = main_window->style->font; + gtk_style_set_font(tooltipsStyle, gtk_style_get_font(main_window->style)); + tooltipsStyle->bg[GTK_STATE_NORMAL] = LYELLOW; gtk_widget_set_style(toolbar->tooltips->tip_window,tooltipsStyle); @@ -707,14 +709,14 @@ status_set_logging_text(); } -GtkWidget * new_pixmap (GtkWidget * widget, char **data) +GtkWidget * new_pixmap (GtkWidget * widget, const char **data) { GdkPixmap *gdkpixmap; GdkBitmap *mask; GtkWidget *pixmap; gdkpixmap = gdk_pixmap_create_from_xpm_d (widget->window, &mask, - &widget->style->bg[GTK_STATE_NORMAL], data); + &widget->style->bg[GTK_STATE_NORMAL], (gchar **)data); pixmap = gtk_pixmap_new(gdkpixmap, mask); return pixmap; } @@ -731,7 +733,10 @@ static GtkWidget *icon_log; static GtkWidget *icon_about; - toolbar = gtk_toolbar_new( GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); + gtk_box_pack_start( GTK_BOX(vbox), toolbar, FALSE, TRUE, 0); gtk_widget_show(toolbar); @@ -761,6 +766,8 @@ gtk_toolbar_append_item( GTK_TOOLBAR(toolbar), _(" Prefs "), _("Edit Preferences"), "", icon_preferences, GTK_SIGNAL_FUNC(preferences_dialog), NULL); + icon_about = (void *)help_xpm; + icon_about = NULL; icon_about = new_pixmap(window, help_xpm); gtk_toolbar_append_item( GTK_TOOLBAR(toolbar), _(" About "), _("About LinNeighborhood"), "", icon_about, GTK_SIGNAL_FUNC(about_dialog), NULL); @@ -933,12 +940,14 @@ return 0; } +#if 0 static gint uposition_configure (GtkWidget *window) { gdk_window_get_root_origin(window->window, &(size.main_x), &(size.main_y)); return FALSE; } +#endif gint main_events (GtkWidget *main, GdkEvent *event) { @@ -965,7 +974,7 @@ void gtk_gui_init (int argc, char *argv[]) { - GdkWindowPrivate *_private; +// GdkWindowPrivate *_private; GtkWidget *vbox; GdkPixmap *icon_pixmap; GdkBitmap *icon_mask; @@ -983,7 +992,7 @@ //main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); main_window = gtk_widget_new (GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, - "signal::configure_event", uposition_configure, NULL, + /*"signal::configure_event", uposition_configure,*/ NULL, NULL); gtk_window_set_default_size(GTK_WINDOW(main_window), size.main_w, size.main_h); @@ -1000,12 +1009,12 @@ gtk_widget_realize (main_window); - if ( startup.v.start_iconify ) - { - _private = (GdkWindowPrivate*)(main_window->window); - if ( !_private->destroyed ) - XIconifyWindow(_private->xdisplay, _private->xwindow, 0); - } +// if ( startup.v.start_iconify ) +// { +// _private = (GdkWindowPrivate*)(main_window->window); +// if ( !_private->destroyed ) +// XIconifyWindow(_private->xdisplay, _private->xwindow, 0); +// } gtk_signal_connect (GTK_OBJECT(main_window), "delete_event", GTK_SIGNAL_FUNC(main_quit), NULL); diff -urN LinNeighborhood-0.6.5/src/gtk_gui.h LinNeighborhood-0.6.5-new/src/gtk_gui.h --- LinNeighborhood-0.6.5/src/gtk_gui.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_gui.h 2004-08-30 12:18:17.000000000 +0100 @@ -28,7 +28,7 @@ /* ------------------------------------------------------------------------- */ -extern GtkWidget * new_pixmap (GtkWidget * widget, char **data); +extern GtkWidget * new_pixmap (GtkWidget * widget, const char **data); extern void status_set_status_scan (unsigned char scan); extern void status_set_status_scan_text (char *text); @@ -71,14 +71,14 @@ typedef void (*msgdlg_callback)(unsigned int result); typedef void (*txtdlg_callback)(char *input); -extern void ShowMessageDialog (char *title, - char *text, +extern void ShowMessageDialog (const char *title, + const char *text, unsigned int buttons, msgdlg_callback callback ); -extern void TextInputDialog (char *title, - char *text, +extern void TextInputDialog (const char *title, + const char *text, char *input, int input_maxlen, int w, diff -urN LinNeighborhood-0.6.5/src/gtk_mountdlg.c LinNeighborhood-0.6.5-new/src/gtk_mountdlg.c --- LinNeighborhood-0.6.5/src/gtk_mountdlg.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_mountdlg.c 2004-08-31 13:36:14.000000000 +0100 @@ -183,7 +183,7 @@ static gint mount_ok_callback (GtkWidget *widget, GtkWidget *dlg) { - char *supwd; + const char *supwd; int port = -1; mount_point[PATH_LEN]=0; strncpy(mount_point,gtk_entry_get_text(GTK_ENTRY (mount_pointentry)),PATH_LEN-1); @@ -250,7 +250,8 @@ int pipe2_nok,pipe3_nok=1; pid_t childpid; char commandstr[MAXMKDIRCOMMANDL+4],*colonpos; - char *argv[4],*supasswd; + char *argv[4]; + const char *supasswd; int linepos,linenum,linec; static char linebuf[MAXSMBLINEL+1]; GSList *strlist=NULL; @@ -343,7 +344,7 @@ root_file_selection_create_dir_confirmed (GtkWidget *widget, gpointer data) { GtkFileSelection *fs = data; - gchar *dirname; + const gchar *dirname; gchar *full_path; g_return_if_fail (fs != NULL); @@ -485,7 +486,7 @@ } } -void smb_mount_dialog (char *servicename,char *ipaddr,char *group_name, unsigned char show_gui) +void smb_mount_dialog (const char *servicename, const char *ipaddr, const char *group_name, unsigned char show_gui) { GtkWidget *button,*hbox,*vbox,*label, *frame, *table; diff -urN LinNeighborhood-0.6.5/src/gtk_mountdlg.h LinNeighborhood-0.6.5-new/src/gtk_mountdlg.h --- LinNeighborhood-0.6.5/src/gtk_mountdlg.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_mountdlg.h 2004-08-31 13:36:38.000000000 +0100 @@ -23,7 +23,7 @@ /* ------------------------------------------------------------------------- */ -extern void smb_mount_dialog (char *servicename,char *ipaddr,char *group_name, unsigned char show_gui); +extern void smb_mount_dialog (const char *servicename, const char *ipaddr,const char *group_name, unsigned char show_gui); extern void smb_umount_dialog (char *mount_point); extern void smb_mount_dialog_init(void); extern void gtk_smbumount_done(char *mount_point,char *errstr,smbmountStateType smbmountState,int tag); diff -urN LinNeighborhood-0.6.5/src/gtk_sharewindow.c LinNeighborhood-0.6.5-new/src/gtk_sharewindow.c --- LinNeighborhood-0.6.5/src/gtk_sharewindow.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_sharewindow.c 2004-08-31 14:57:47.000000000 +0100 @@ -198,7 +198,7 @@ case ICON_TOOLBAR_UP: if ( !pixmap_toolbar_up ) { pixmap_toolbar_up = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_up, 0, icon_toolbar_up_xpm); + &mask_toolbar_up, 0, (gchar **)icon_toolbar_up_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_up, mask_toolbar_up); break; @@ -206,7 +206,7 @@ case ICON_TOOLBAR_CANCEL: if ( !pixmap_toolbar_cancel ) { pixmap_toolbar_cancel = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_cancel, 0, icon_toolbar_cancel_xpm); + &mask_toolbar_cancel, 0, (gchar **)icon_toolbar_cancel_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_cancel, mask_toolbar_cancel); break; @@ -214,7 +214,7 @@ case ICON_TOOLBAR_DELETE: if ( !pixmap_toolbar_delete ) { pixmap_toolbar_delete = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_delete, 0, icon_toolbar_delete_xpm); + &mask_toolbar_delete, 0, (gchar **)icon_toolbar_delete_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_delete, mask_toolbar_delete); break; @@ -222,7 +222,7 @@ case ICON_TOOLBAR_COPY: if ( !pixmap_toolbar_copy ) { pixmap_toolbar_copy = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_copy, 0, icon_toolbar_copy_xpm); + &mask_toolbar_copy, 0, (gchar **)icon_toolbar_copy_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_copy, mask_toolbar_copy); break; @@ -230,7 +230,7 @@ case ICON_TOOLBAR_INSERT: if ( !pixmap_toolbar_insert ) { pixmap_toolbar_insert = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_insert, 0, icon_toolbar_insert_xpm); + &mask_toolbar_insert, 0, (gchar **)icon_toolbar_insert_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_insert, mask_toolbar_insert); break; @@ -238,7 +238,7 @@ case ICON_TOOLBAR_PREFS: if ( !pixmap_toolbar_prefs ) { pixmap_toolbar_prefs = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_toolbar_prefs, 0, icon_toolbar_prefs_xpm); + &mask_toolbar_prefs, 0, (gchar **)icon_toolbar_prefs_xpm); } icon = gtk_pixmap_new(pixmap_toolbar_prefs, mask_toolbar_prefs); break; @@ -289,98 +289,98 @@ case ICON_FILE_DIRECTORY: if ( !pixmap_file_directory ) { pixmap_file_directory = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_directory, 0, i_directory_xpm); + &mask_file_directory, 0, (gchar **)i_directory_xpm); } break; case ICON_FILE_HIDDEN: if ( !pixmap_file_hidden ) { pixmap_file_hidden = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_hidden, 0, i_hidden_xpm); + &mask_file_hidden, 0, (gchar **)i_hidden_xpm); } break; case ICON_FILE_TXT: if ( !pixmap_file_txt ) { pixmap_file_txt = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_txt, 0, i_txt_xpm); + &mask_file_txt, 0, (gchar **)i_txt_xpm); } break; case ICON_FILE_CPP: if ( !pixmap_file_cpp ) { pixmap_file_cpp = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_cpp, 0, i_cpp_xpm); + &mask_file_cpp, 0, (gchar **)i_cpp_xpm); } break; case ICON_FILE_C: if ( !pixmap_file_c ) { pixmap_file_c = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_c, 0, i_c_xpm); + &mask_file_c, 0, (gchar **)i_c_xpm); } break; case ICON_FILE_H: if ( !pixmap_file_h ) { pixmap_file_h = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_h, 0, i_h_xpm); + &mask_file_h, 0, (gchar **)i_h_xpm); } break; case ICON_FILE_ZIP: if ( !pixmap_file_zip ) { pixmap_file_zip = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_zip, 0, i_zip_xpm); + &mask_file_zip, 0, (gchar **)i_zip_xpm); } break; case ICON_FILE_EXE: if ( !pixmap_file_exe ) { pixmap_file_exe = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_exe, 0, i_exe_xpm); + &mask_file_exe, 0, (gchar **)i_exe_xpm); } break; case ICON_FILE_DLL: if ( !pixmap_file_dll ) { pixmap_file_dll = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_dll, 0, i_dll_xpm); + &mask_file_dll, 0, (gchar **)i_dll_xpm); } break; case ICON_FILE_HTML: if ( !pixmap_file_html ) { pixmap_file_html = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_html, 0, i_html_xpm); + &mask_file_html, 0, (gchar **)i_html_xpm); } break; case ICON_FILE_GIF: if ( !pixmap_file_gif ) { pixmap_file_gif = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_gif, 0, i_gif_xpm); + &mask_file_gif, 0, (gchar **)i_gif_xpm); } break; case ICON_FILE_JAVA: if ( !pixmap_file_java ) { pixmap_file_java = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_java, 0, i_java_xpm); + &mask_file_java, 0, (gchar **)i_java_xpm); } break; case ICON_FILE_HLP: if ( !pixmap_file_hlp ) { pixmap_file_hlp = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_hlp, 0, i_hlp_xpm); + &mask_file_hlp, 0, (gchar **)i_hlp_xpm); } break; default: if ( !pixmap_file_default ) { pixmap_file_default = gdk_pixmap_create_from_xpm_d(main_window->window, - &mask_file_default, 0, i_default_xpm); + &mask_file_default, 0, (gchar **)i_default_xpm); } break; } @@ -749,7 +749,7 @@ static void dialog_smb_file_copy_from_ok_callback (GtkWidget *window) { share_file_struct *file; - char *filename; + const char *filename; file = (share_file_struct*)gtk_object_get_data(GTK_OBJECT(window), SMB_FILESELECT_DATA); @@ -764,7 +764,7 @@ if ( file_exist(filename) ) { /* file does exist, overwrite it ? */ - dialog_file_overwrite(dialog_smb_file_exists_ok_callback, NULL, file, sizeof(share_file_struct)); + dialog_file_overwrite(GTK_SIGNAL_FUNC(dialog_smb_file_exists_ok_callback), NULL, file, sizeof(share_file_struct)); } else { @@ -1101,7 +1101,10 @@ gtk_entry_set_editable(GTK_ENTRY(data->edit), 0); gtk_box_pack_start(GTK_BOX(hbox), data->edit, FALSE, FALSE, 0); - toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); + toolbar = gtk_toolbar_new(); + gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); + gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); + gtk_box_pack_start(GTK_BOX(hbox), toolbar, FALSE, TRUE, 0); gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); @@ -1302,7 +1305,7 @@ if ( !pixmap_window_icon ) { pixmap_window_icon = gdk_pixmap_create_from_xpm_d (data->window->window, &mask_window_icon, - &(data->window)->style->bg[GTK_STATE_NORMAL], ShareWindow_xpm); + &(data->window)->style->bg[GTK_STATE_NORMAL], (gchar **)ShareWindow_xpm); } gdk_window_set_icon(data->window->window, NULL, pixmap_window_icon, mask_window_icon); @@ -1520,8 +1523,8 @@ /* search the window widget of a share path */ -GtkWidget *share_window_get_window (char *group, char *machine, char *share, - char *path, unsigned char reset) +GtkWidget *share_window_get_window (const char *group, const char *machine, const char *share, + const char *path, unsigned char reset) { static GSList *templist = NULL; sharewin_struct *sharewin; @@ -1587,7 +1590,7 @@ } /* local file system version */ -GtkWidget *share_window_get_local_window (char *path, unsigned char reset) +GtkWidget *share_window_get_local_window (const char *path, unsigned char reset) { static GSList *templist = NULL; sharewin_struct *sharewin; diff -urN LinNeighborhood-0.6.5/src/gtk_sharewindow.h LinNeighborhood-0.6.5-new/src/gtk_sharewindow.h --- LinNeighborhood-0.6.5/src/gtk_sharewindow.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_sharewindow.h 2004-08-30 21:44:24.000000000 +0100 @@ -33,10 +33,10 @@ extern unsigned char share_window_is_local_file (share_window_struct *sw_struct); extern GtkWidget *share_window_already_exists (share_window_struct *sw_struct); -extern GtkWidget *share_window_get_window (char *group, char *machine, char *share, - char *path, unsigned char reset); +extern GtkWidget *share_window_get_window (const char *group, const char *machine, const char *share, + const char *path, unsigned char reset); extern GtkWidget *share_window_get_window_by_clist (GtkCList *clist, unsigned char reset); -extern GtkWidget *share_window_get_local_window (char *path, unsigned char reset); +extern GtkWidget *share_window_get_local_window (const char *path, unsigned char reset); extern void share_window_clean (void); extern void share_window_add_files (GtkWidget *window, GSList *files); extern void share_window_copy_smb_to_local(share_file_struct f_struct); diff -urN LinNeighborhood-0.6.5/src/gtk_tree.c LinNeighborhood-0.6.5-new/src/gtk_tree.c --- LinNeighborhood-0.6.5/src/gtk_tree.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/gtk_tree.c 2004-08-30 13:13:26.000000000 +0100 @@ -111,7 +111,7 @@ /* host */ static void host_get_name (GtkTreeItem *item, char **name); static host_struct *host_get_data_by_item (GtkTreeItem *item); -static GtkTreeItem *host_get_by_name (char *host); +static GtkTreeItem *host_get_by_name (const char *host); /* mount */ #ifndef NO_SMBMOUNT static void mount_retrigger (); @@ -794,7 +794,7 @@ if ( !root_pixmap ) { root_pixmap = gdk_pixmap_create_from_xpm_d(main_window->window, - &root_mask, 0, root_xpm); + &root_mask, 0, (gchar **)root_xpm); } gdkpixmap = root_pixmap; mask = root_mask; @@ -804,7 +804,7 @@ if ( !group_pixmap ) { group_pixmap = gdk_pixmap_create_from_xpm_d(main_window->window, - &group_mask, 0, group_xpm); + &group_mask, 0, (gchar **)group_xpm); } gdkpixmap = group_pixmap; mask = group_mask; @@ -815,7 +815,7 @@ if ( !machine_pixmap ) { machine_pixmap = gdk_pixmap_create_from_xpm_d(main_window->window, - &machine_mask, 0, machine_xpm); + &machine_mask, 0, (gchar **)machine_xpm); } gdkpixmap = machine_pixmap; mask = machine_mask; @@ -825,7 +825,7 @@ if ( !folder_pixmap ) { folder_pixmap = gdk_pixmap_create_from_xpm_d(main_window->window, - &folder_mask, 0, folder_xpm); + &folder_mask, 0, (gchar **)folder_xpm); } gdkpixmap = folder_pixmap; mask = folder_mask; @@ -939,7 +939,7 @@ } } -static GtkTreeItem *group_get_by_name (char *group) +static GtkTreeItem *group_get_by_name (const char *group) { GtkTreeItem *item, *ritem; GList *list; @@ -1112,7 +1112,7 @@ } } -static GtkTreeItem *machine_get_by_name (char *group, char *machine) +static GtkTreeItem *machine_get_by_name (const char *group, const char *machine) { GtkTreeItem *item, *ritem; GList *list; @@ -1374,7 +1374,7 @@ } } -static GtkTreeItem *share_get_by_name (char *group, char *machine, char *share) +static GtkTreeItem *share_get_by_name (const char *group, const char *machine, const char *share) { GtkTreeItem *item, *ritem; GList *list; @@ -1520,7 +1520,7 @@ } //static void share_retrigger (char *groupname, char *machinename) -static void share_retrigger (char *groupname, data_notify_struct *notify) +static void share_retrigger (const char *groupname, data_notify_struct *notify) { GtkWidget* subtree; GtkTreeItem *machineitem; @@ -1619,7 +1619,7 @@ return GTK_TREE_ITEM(item); } -static GtkTreeItem *host_get_by_name (char *host) +static GtkTreeItem *host_get_by_name (const char *host) { GtkTreeItem *item, *ritem; GList *list; diff -urN LinNeighborhood-0.6.5/src/guiwrap.c LinNeighborhood-0.6.5-new/src/guiwrap.c --- LinNeighborhood-0.6.5/src/guiwrap.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/guiwrap.c 2004-08-30 21:41:19.000000000 +0100 @@ -134,7 +134,7 @@ share_window_clean(); } -void gui_set_files (char *group, char *machine, char *share, char *path, +void gui_set_files (const char *group, const char *machine, const char *share, const char *path, GSList *files) { GtkWidget *window; diff -urN LinNeighborhood-0.6.5/src/guiwrap.h LinNeighborhood-0.6.5-new/src/guiwrap.h --- LinNeighborhood-0.6.5/src/guiwrap.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/guiwrap.h 2004-08-30 21:40:58.000000000 +0100 @@ -63,7 +63,7 @@ extern void gui_remove_entire_tree (void); extern void gui_share_window_clean (void); -extern void gui_set_files (char *group, char *machine, char *share, char *path, +extern void gui_set_files (const char *group, const char *machine, const char *share, const char *path, GSList *files); /* ------------------------------------------------------------------------- */ diff -urN LinNeighborhood-0.6.5/src/libsmb.c LinNeighborhood-0.6.5-new/src/libsmb.c --- LinNeighborhood-0.6.5/src/libsmb.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/libsmb.c 2004-08-30 21:47:20.000000000 +0100 @@ -120,9 +120,9 @@ * computes the database_name from the group, machine and user names */ -static void create_database_name (char *name, char *group, - char *machine, - char *user ) +static void create_database_name (char *name, const char *group, + const char *machine, + const char *user ) { name[0] = 0; @@ -140,9 +140,9 @@ * create a new one if it doesn't exist */ -static auth_database_entry *lib_smb_auth_database_get_entry (char *group, - char *machine, - char *user, +static auth_database_entry *lib_smb_auth_database_get_entry (const char *group, + const char *machine, + const char *user, unsigned char create) { auth_database_entry *entry, *ret_entry; @@ -200,10 +200,10 @@ * adds an authentication entry to the list */ -void lib_smb_auth_database_add ( char *group, - char *machine, - char *user, - char *password ) +void lib_smb_auth_database_add ( const char *group, + const char *machine, + const char *user, + const char *password ) { auth_database_entry *entry; @@ -924,8 +924,8 @@ * */ -GSList *lib_smb_browse_share (char *group, char *machine, char *share_path, - char *user, char *password) +GSList *lib_smb_browse_share (const char *group, const char *machine, const char *share_path, + const char *user, const char *password) { #ifndef NO_LIBSMB char *share_url; @@ -1359,8 +1359,8 @@ pthread_exit( 0 ); } -void GetLibSMBPath (char *group, char *machine, char *share, char *path, - char *user, char *password, PATH_BROWSE_INFO *browse_info) +void GetLibSMBPath (const char *group, const char *machine, const char *share, const char *path, + const char *user, const char *password, PATH_BROWSE_INFO *browse_info) { int pipe_nok; LIBSMB_PBROWSE_STRUCT *browsedat; @@ -1500,8 +1500,8 @@ pthread_exit( 0 ); } -void CopySMBToLocal (char *group, char *machine, char *share, char *path, - char *filename, char *user, char *password, copy_file_callback callback) +void CopySMBToLocal (const char *group, const char *machine, const char *share, const char *path, + const char *filename, const char *user, const char *password, copy_file_callback callback) { int pipe_nok; COPY_SMB_TO_LOCAL_STRUCT *copydat; @@ -1604,7 +1604,7 @@ * != 0 -> file exists */ -unsigned char lib_smb_file_exists (char *machine, char *share, char *path) +unsigned char lib_smb_file_exists (const char *machine, const char *share, const char *path) { unsigned char exist = 0; #ifndef NO_LIBSMB diff -urN LinNeighborhood-0.6.5/src/libsmb.h LinNeighborhood-0.6.5-new/src/libsmb.h --- LinNeighborhood-0.6.5/src/libsmb.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/libsmb.h 2004-08-30 21:47:45.000000000 +0100 @@ -90,10 +90,10 @@ * will use this database to get its authentication. * --------------------------------------------------------------------- */ -extern void lib_smb_auth_database_add ( char *group, - char *machine, - char *user, - char *password ); +extern void lib_smb_auth_database_add ( const char *group, + const char *machine, + const char *user, + const char *password ); /* ------------------------------------------------------------------------- * Does make a browse of a share. Returns a GSList containig objects @@ -101,19 +101,19 @@ * directories first. * ------------------------------------------------------------------------- */ -extern GSList *lib_smb_browse_share (char *group, char *machine, char *share_path, - char *user, char *password); +extern GSList *lib_smb_browse_share (const char *group, const char *machine, const char *share_path, + const char *user, const char *password); /* frees the SLink List with the browsed files */ extern void lib_smb_file_list_delete (GSList **files); /* browse share using its own thread/fork */ -extern void GetLibSMBPath ( char *group, - char *machine, - char *share, - char *path, - char *user, - char *password, +extern void GetLibSMBPath ( const char *group, + const char *machine, + const char *share, + const char *path, + const char *user, + const char *password, PATH_BROWSE_INFO *browse_info); extern void lib_smb_stop_all_browse (void); @@ -163,7 +163,7 @@ extern void lib_smb_init_copy_struct (file_copy_struct *cp_struct); -extern unsigned char lib_smb_file_exists (char *machine, char *share, char *path); +extern unsigned char lib_smb_file_exists (const char *machine, const char *share, const char *path); extern int lib_smb_copy_local_to_smb_path (char *local_path, char *smb_path, file_copy_struct *c_struct); extern int lib_smb_copy_local_to_smb (char *local_path, char *machine, diff -urN LinNeighborhood-0.6.5/src/lmhosts.c LinNeighborhood-0.6.5-new/src/lmhosts.c --- LinNeighborhood-0.6.5/src/lmhosts.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/lmhosts.c 2004-08-31 14:34:33.000000000 +0100 @@ -242,7 +242,7 @@ /* - * This next test is redundent and causes some systems (with + * This next test is redundant and causes some systems (with * broken isalnum() calls) problems. * JRA. */ @@ -296,7 +296,7 @@ /**************************************************************************** interpret an internet address or name into an IP address in 4 byte form ****************************************************************************/ -static uint32 interpret_addr(char *str) +static uint32 interpret_addr(const char *str) { struct hostent *hp; uint32 res; @@ -333,7 +333,7 @@ /******************************************************************* a convenient addition to interpret_addr() ******************************************************************/ -static struct in_addr *interpret_addr2(char *str) +static struct in_addr *interpret_addr2(const char *str) { static struct in_addr ret; uint32 a = interpret_addr(str); @@ -345,7 +345,7 @@ Start parsing the lmhosts file. *********************************************************/ -FILE *startlmhosts(char *fname) +FILE *startlmhosts(const char *fname) { FILE *fp = fopen(fname,"r"); if (!fp) { diff -urN LinNeighborhood-0.6.5/src/picture/ShareWindow.xpm LinNeighborhood-0.6.5-new/src/picture/ShareWindow.xpm --- LinNeighborhood-0.6.5/src/picture/ShareWindow.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/ShareWindow.xpm 2004-08-30 12:21:21.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * ShareWindow_xpm[] = { +static const char * ShareWindow_xpm[] = { "16 16 10 1", " c None", ". c #A5A5A5", diff -urN LinNeighborhood-0.6.5/src/picture/add.xpm LinNeighborhood-0.6.5-new/src/picture/add.xpm --- LinNeighborhood-0.6.5/src/picture/add.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/add.xpm 2004-08-30 12:00:49.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * add_xpm[] = { +static const char * add_xpm[] = { "20 20 8 1", " c None", ". c #FFFF00", diff -urN LinNeighborhood-0.6.5/src/picture/arrow_down_button.xpm LinNeighborhood-0.6.5-new/src/picture/arrow_down_button.xpm --- LinNeighborhood-0.6.5/src/picture/arrow_down_button.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/arrow_down_button.xpm 2004-08-30 12:00:55.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * arrow_down_button_xpm[] = { +static const char * arrow_down_button_xpm[] = { "32 16 2 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/close.xpm LinNeighborhood-0.6.5-new/src/picture/close.xpm --- LinNeighborhood-0.6.5/src/picture/close.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/close.xpm 2004-08-30 12:01:01.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * close_xpm[] = { +static const char * close_xpm[] = { "20 20 4 1", " c None", ". c #BFBFBF", diff -urN LinNeighborhood-0.6.5/src/picture/edit.xpm LinNeighborhood-0.6.5-new/src/picture/edit.xpm --- LinNeighborhood-0.6.5/src/picture/edit.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/edit.xpm 2004-08-30 12:01:09.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * edit_xpm[] = { +static const char * edit_xpm[] = { "20 20 17 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/favourites.xpm LinNeighborhood-0.6.5-new/src/picture/favourites.xpm --- LinNeighborhood-0.6.5/src/picture/favourites.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/favourites.xpm 2004-08-30 12:01:16.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * favourites_xpm[] = { +static const char * favourites_xpm[] = { "20 20 15 1", " c None", ". c #AEB2AE", diff -urN LinNeighborhood-0.6.5/src/picture/folder.xpm LinNeighborhood-0.6.5-new/src/picture/folder.xpm --- LinNeighborhood-0.6.5/src/picture/folder.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/folder.xpm 2004-08-30 12:01:23.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * folder_xpm[] = { +static const char * folder_xpm[] = { "18 18 10 1", " c None", ". c #A5A5A5", diff -urN LinNeighborhood-0.6.5/src/picture/group.xpm LinNeighborhood-0.6.5-new/src/picture/group.xpm --- LinNeighborhood-0.6.5/src/picture/group.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/group.xpm 2004-08-30 12:01:44.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * group_xpm[] = { +static const char * group_xpm[] = { "18 18 13 1", " c None", ". c #000080", diff -urN LinNeighborhood-0.6.5/src/picture/help.xpm LinNeighborhood-0.6.5-new/src/picture/help.xpm --- LinNeighborhood-0.6.5/src/picture/help.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/help.xpm 2004-08-30 12:01:50.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * help_xpm[] = { +static const char * help_xpm[] = { "20 20 17 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/i_c.xpm LinNeighborhood-0.6.5-new/src/picture/i_c.xpm --- LinNeighborhood-0.6.5/src/picture/i_c.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/i_c.xpm 2004-08-30 12:02:54.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * i_c_xpm[] = { +static const char * i_c_xpm[] = { "18 17 7 1", " c None", ". c #FFFFFF", diff -urN LinNeighborhood-0.6.5/src/picture/i_cpp.xpm LinNeighborhood-0.6.5-new/src/picture/i_cpp.xpm --- LinNeighborhood-0.6.5/src/picture/i_cpp.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/i_cpp.xpm 2004-08-30 12:02:59.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * i_cpp_xpm[] = { +static const char * i_cpp_xpm[] = { "18 17 7 1", " c None", ". c #FFFFFF", diff -urN LinNeighborhood-0.6.5/src/picture/i_default.xpm LinNeighborhood-0.6.5-new/src/picture/i_default.xpm --- LinNeighborhood-0.6.5/src/picture/i_default.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/i_default.xpm 2004-08-30 12:03:05.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * i_default_xpm[] = { +static const char * i_default_xpm[] = { "18 17 5 1", " c None", ". c #FFFFFF", diff -urN LinNeighborhood-0.6.5/src/picture/i_directory.xpm LinNeighborhood-0.6.5-new/src/picture/i_directory.xpm --- LinNeighborhood-0.6.5/src/picture/i_directory.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/i_directory.xpm 2004-08-30 12:03:12.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * i_directory_xpm[] = { +static const char * i_directory_xpm[] = { "18 17 10 1", " c None", ". c #A5A5A5", diff -urN LinNeighborhood-0.6.5/src/picture/i_dll.xpm LinNeighborhood-0.6.5-new/src/picture/i_dll.xpm --- LinNeighborhood-0.6.5/src/picture/i_dll.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/i_dll.xpm 2004-08-30 12:03:20.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * i_dll_xpm[] = { +static const char * i_dll_xpm[] = { "18 17 7 1", " c None", ". c #FFFFFF", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_cancel.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_cancel.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_cancel.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_cancel.xpm 2004-08-30 12:01:58.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_cancel_xpm[] = { +static const char * icon_toolbar_cancel_xpm[] = { "18 18 3 1", " c None", ". c #800000", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_copy.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_copy.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_copy.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_copy.xpm 2004-08-30 12:02:05.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_copy_xpm[] = { +static const char * icon_toolbar_copy_xpm[] = { "18 18 4 1", " c None", "+ c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_delete.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_delete.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_delete.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_delete.xpm 2004-08-30 12:02:11.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_delete_xpm[] = { +static const char * icon_toolbar_delete_xpm[] = { "18 18 3 1", " c None", "+ c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_insert.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_insert.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_insert.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_insert.xpm 2004-08-30 12:02:20.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_insert_xpm[] = { +static const char * icon_toolbar_insert_xpm[] = { "18 18 8 1", " c None", ". c #C0C0C0", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_prefs.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_prefs.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_prefs.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_prefs.xpm 2004-08-30 12:02:27.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_prefs_xpm[] = { +static const char * icon_toolbar_prefs_xpm[] = { "18 18 5 1", " c None", ". c #C0C0C0", diff -urN LinNeighborhood-0.6.5/src/picture/icon_toolbar_up.xpm LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_up.xpm --- LinNeighborhood-0.6.5/src/picture/icon_toolbar_up.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/icon_toolbar_up.xpm 2004-08-30 12:02:34.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * icon_toolbar_up_xpm[] = { +static const char * icon_toolbar_up_xpm[] = { "18 18 4 1", " c None", ". c #C0C0C0", diff -urN LinNeighborhood-0.6.5/src/picture/log.xpm LinNeighborhood-0.6.5-new/src/picture/log.xpm --- LinNeighborhood-0.6.5/src/picture/log.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/log.xpm 2004-08-30 12:21:31.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * log_xpm[] = { +static const char * log_xpm[] = { "20 20 16 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/mount.xpm LinNeighborhood-0.6.5-new/src/picture/mount.xpm --- LinNeighborhood-0.6.5/src/picture/mount.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/mount.xpm 2004-08-30 12:21:00.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * mount_xpm[] = { +static const char * mount_xpm[] = { "20 20 17 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/neighborhood-logo.xpm LinNeighborhood-0.6.5-new/src/picture/neighborhood-logo.xpm --- LinNeighborhood-0.6.5/src/picture/neighborhood-logo.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/neighborhood-logo.xpm 2004-08-30 12:00:28.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * neighborhood_logo_xpm[] = { +static const char * neighborhood_logo_xpm[] = { "246 150 48 1", " c None", ". c #FFFFFF", diff -urN LinNeighborhood-0.6.5/src/picture/remove.xpm LinNeighborhood-0.6.5-new/src/picture/remove.xpm --- LinNeighborhood-0.6.5/src/picture/remove.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/remove.xpm 2004-08-30 12:03:45.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * remove_xpm[] = { +static const char * remove_xpm[] = { "20 20 17 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/picture/umount.xpm LinNeighborhood-0.6.5-new/src/picture/umount.xpm --- LinNeighborhood-0.6.5/src/picture/umount.xpm 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/picture/umount.xpm 2004-08-30 12:21:17.000000000 +0100 @@ -1,5 +1,5 @@ /* XPM */ -static char * umount_xpm[] = { +static const char * umount_xpm[] = { "20 20 17 1", " c None", ". c #000000", diff -urN LinNeighborhood-0.6.5/src/preferences.c LinNeighborhood-0.6.5-new/src/preferences.c --- LinNeighborhood-0.6.5/src/preferences.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/preferences.c 2004-09-03 22:16:13.000000000 +0100 @@ -47,7 +47,7 @@ /* imports the lmhost file */ -unsigned char load_lmhosts_file (char *file) +unsigned char load_lmhosts_file (const char *file) { FILE *fp; pstring name; diff -urN LinNeighborhood-0.6.5/src/preferences.h LinNeighborhood-0.6.5-new/src/preferences.h --- LinNeighborhood-0.6.5/src/preferences.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/preferences.h 2004-08-29 23:10:15.000000000 +0100 @@ -35,7 +35,7 @@ /* ------------------------------------------------------------------------- */ -extern unsigned char load_lmhosts_file (char *file); +extern unsigned char load_lmhosts_file (const char *file); /* ------------------------------------------------------------------------- */ diff -urN LinNeighborhood-0.6.5/src/samba.h LinNeighborhood-0.6.5-new/src/samba.h --- LinNeighborhood-0.6.5/src/samba.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/samba.h 2004-08-29 23:30:47.000000000 +0100 @@ -30,7 +30,7 @@ typedef int BOOL; typedef char pstring[STRLEN+1]; -extern FILE *startlmhosts(char *fname); +extern FILE *startlmhosts(const char *fname); extern BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); extern void endlmhosts(FILE *fp); diff -urN LinNeighborhood-0.6.5/src/smbbrowse.c LinNeighborhood-0.6.5-new/src/smbbrowse.c --- LinNeighborhood-0.6.5/src/smbbrowse.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/smbbrowse.c 2004-09-10 12:17:33.000000000 +0100 @@ -28,6 +28,7 @@ #include "utility.h" #include "preferences.h" +#include #define MAXCOMMANDL 100 /*should be enough for user/passwd*/ @@ -329,7 +330,7 @@ { gui_log_window_insert_string(browsedat->linebuf,1); browsedat->linenum++; -/* g_print("%s\n",browsedat->linebuf); */ +/* g_print("groups: %s\n",browsedat->linebuf); */ switch(browsedat->browse_state) { case search_head: @@ -405,7 +406,7 @@ } if (linec==EOF) { -/* g_print("Ready!\n"); */ +/* g_print("Ready!\n"); */ close(source); kill(browsedat->childpid,SIGINT); waitpid(browsedat->childpid,NULL,0); @@ -690,7 +691,7 @@ } -void GetSMBGroups ( char * group_name, char * master_browser, char * user, char * passwd, char * wins_name,char first_master,int port, GROUPS_BROWSE_INFO *browse_info) +void GetSMBGroups ( const char * group_name, const char * master_browser, const char * user, const char * passwd, const char * wins_name,char first_master,int port, GROUPS_BROWSE_INFO *browse_info) { GBROWSE_STRUCT *browsedat; int pipe_nok; @@ -699,7 +700,7 @@ char port_str[16]; char *cport = NULL; char *cportkey = NULL; - char *cArg[20]; + const char *cArg[20]; char *cAddArg[10]; int argcount = 0; char add_arg_string[ARG_LEN+1]; @@ -768,7 +769,7 @@ } cArg[argcount] = NULL; - execvp(pref_get_smbclient_exe(), cArg); + execvp(pref_get_smbclient_exe(), (char **)cArg); /*execlp(pref_get_smbclient_exe(), "smbclient", @@ -829,6 +830,8 @@ dup2(browsedat->fd[1],STDOUT_FILENO); cArg[argcount++] = "nmblookup"; + cArg[argcount++] = "-S"; + cArg[argcount++] = "-d1"; if ( *wins_name ) { cArg[argcount++] = "-U"; @@ -839,17 +842,18 @@ else { cArg[argcount++] = "-M"; + + if (strcmp(group_name, "-") == 0) + cArg[argcount++] = "--"; cArg[argcount++] = group_name; } - cArg[argcount++] = "-S"; - cArg[argcount++] = "-d1"; for ( loop = 0; loop < add_argcount; loop++ ) { cArg[argcount++] = cAddArg[loop]; } cArg[argcount++] = NULL; - - execvp(pref_get_nmblookup_exe(), cArg); + + execvp(pref_get_nmblookup_exe(), (char **)cArg); /*if (*wins_name) execlp(pref_get_nmblookup_exe(), @@ -908,7 +912,7 @@ { gui_log_window_insert_string(browsedat->linebuf,1); browsedat->linenum++; -/* g_print("%s\n",browsedat->linebuf); */ + g_print("machines: %s\n",browsedat->linebuf); switch(browsedat->browse_state) { case search_head: @@ -965,7 +969,7 @@ } if (linec==EOF) { -/* g_print("Ready!\n"); */ +/* g_print("Ready!\n"); */ close(source); kill(browsedat->childpid,SIGINT); waitpid(browsedat->childpid,NULL,0); @@ -995,7 +999,7 @@ -void GetSMBMachines (char * group_name, char *master_browser, char * user, char * passwd,char *domain,int port,MACHINES_BROWSE_INFO *browse_info) +void GetSMBMachines (const char * group_name, const char *master_browser, const char * user, const char * passwd, const char *domain,int port,MACHINES_BROWSE_INFO *browse_info) { HBROWSE_STRUCT *browsedat; int pipe_nok; @@ -1004,7 +1008,7 @@ char port_str[16]; char *cport = NULL; char *cportkey = NULL; - char *cArg[20]; + const char *cArg[20]; char *cAddArg[10]; int argcount = 0; char add_arg_string[ARG_LEN+1]; @@ -1071,7 +1075,7 @@ cArg[argcount] = NULL; - execvp(pref_get_smbclient_exe(), cArg); + execvp(pref_get_smbclient_exe(), (char **)cArg); _exit(0); } else @@ -1138,7 +1142,7 @@ { gui_log_window_insert_string(browsedat->linebuf,1); browsedat->linenum++; -/* g_print("%s\n",browsedat->linebuf); */ +/* g_print("shares: %s\n",browsedat->linebuf); */ switch(browsedat->browse_state) { case search_head: @@ -1151,8 +1155,11 @@ while (*posi2!=' ' && *posi2) posi2++;/*find last number*/ if (posi2-1>posi1) { - copyentrystr(browsedat->machineinfo.ipaddr,browsedat->linebuf,posi1-browsedat->linebuf, - posi2-browsedat->linebuf,MAXMACHNAMEL); + copyentrystr(browsedat->machineinfo.ipaddr, + browsedat->linebuf, + posi1-browsedat->linebuf, + posi2-browsedat->linebuf, + MAXMACHNAMEL); } /* browsedat->browse_state=search_entryhead; */ break; @@ -1230,7 +1237,7 @@ } if (linec==EOF) { -/* g_print("Ready!\n"); */ +/* g_print("Ready!\n"); */ close(source); kill(browsedat->childpid,SIGINT); waitpid(browsedat->childpid,NULL,0); @@ -1254,13 +1261,13 @@ } -void GetSMBShares (char *group_name,char *machine_name,char *domain,char *ipaddr,char *user,char *passwd,int port,SHARES_BROWSE_INFO *browse_info ) +void GetSMBShares (const char *group_name,const char *machine_name,const char *domain,const char *ipaddr,const char *user,const char *passwd,int port,SHARES_BROWSE_INFO *browse_info ) { char commandstr[MAXCOMMANDL+1]; SBROWSE_STRUCT *browsedat; int pipe_nok; int argnr=-1; - char *argv[22]; + const char *argv[22]; char port_str[16]; char *cAddArg[10]; char add_arg_string[ARG_LEN+1]; @@ -1316,14 +1323,14 @@ { close(browsedat->fd[0]); dup2(browsedat->fd[1],STDOUT_FILENO); - execvp(pref_get_smbclient_exe(),argv); + execvp(pref_get_smbclient_exe(),(char **)argv); _exit(0); } else { if (*user!=0) memset(commandstr+strlen(commandstr)-strlen(passwd),'*',strlen(passwd)); gui_log_window_insert_string("GetSMBShare:",0); - log_execvp_str(pref_get_smbclient_exe(),argv); + log_execvp_str(pref_get_smbclient_exe(), (char **)argv); close(browsedat->fd[1]); sbrowsedatlist=g_slist_append(sbrowsedatlist,browsedat); browsedat->linepos=0; @@ -1418,14 +1425,14 @@ -void LookupByName ( char * machine_name, char * wins_name) +void LookupByName ( const char * machine_name, const char * wins_name) { LOOKUP_STRUCT *lookupdat; GSList *lookuplist; int pipe_nok; int fd[2]; char logstr[MAXLOGSTRLEN+1]; -char *cArg[20]; +const char *cArg[20]; char *cAddArg[10]; int argcount = 0; char add_arg_string[ARG_LEN+1]; @@ -1497,7 +1504,7 @@ } cArg[argcount++] = NULL; - execvp(pref_get_nmblookup_exe(), cArg); + execvp(pref_get_nmblookup_exe(), (char **)cArg); /*if (*wins_name) execlp(pref_get_nmblookup_exe(), @@ -1609,14 +1616,14 @@ } -void LookupByIP( char *ipaddr) +void LookupByIP(const char *ipaddr) { LOOKUP_STRUCT *lookupdat; GSList *lookuplist; int pipe_nok; int fd[2]; char logstr[MAXLOGSTRLEN+1]; -char *cArg[20]; +const char *cArg[20]; char *cAddArg[10]; int argcount = 0; char add_arg_string[ARG_LEN+1]; @@ -1679,7 +1686,7 @@ } cArg[argcount++] = NULL; - execvp(pref_get_nmblookup_exe(), cArg); + execvp(pref_get_nmblookup_exe(), (char **)cArg); /*execlp(pref_get_nmblookup_exe(), "nmblookup", diff -urN LinNeighborhood-0.6.5/src/smbif.h LinNeighborhood-0.6.5-new/src/smbif.h --- LinNeighborhood-0.6.5/src/smbif.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/smbif.h 2004-08-30 11:58:02.000000000 +0100 @@ -40,40 +40,40 @@ //Neue Prototypen fuer die _done - Funktionen in browsewrap.h ( ohne '_' ) -extern void GetSMBGroups ( char *group_name, - char *master_browser, - char *user, - char *passwd, - char *wins_name, +extern void GetSMBGroups ( const char *group_name, + const char *master_browser, + const char *user, + const char *passwd, + const char *wins_name, char first_master, int port, GROUPS_BROWSE_INFO *browse_info ); -extern void GetSMBMachines ( char *group_name, - char *master_browser, - char *user, - char *passwd, - char *domain, +extern void GetSMBMachines ( const char *group_name, + const char *master_browser, + const char *user, + const char *passwd, + const char *domain, int port, MACHINES_BROWSE_INFO *browse_info ); -extern void GetSMBShares ( char *group_name, - char *machine_name, - char *domain, - char *ipaddr, - char *user, - char *passwd, +extern void GetSMBShares ( const char *group_name, + const char *machine_name, + const char *domain, + const char *ipaddr, + const char *user, + const char *passwd, int port, SHARES_BROWSE_INFO *browse_info ); -extern void LookupByName ( char * machine_name, char * wins_name); -extern void LookupByIP( char *ipaddr); +extern void LookupByName ( const char * machine_name, const char * wins_name); +extern void LookupByIP( const char *ipaddr); -extern void smbmount(char *servicename, char *mount_point,char *clientname,char *ipaddr, - char *group_name,char *smbuser,char *smbpasswd,uid_t uid,gid_t gid, - mode_t filemode,mode_t dirmode,int port,char *supasswd); +extern void smbmount(const char *servicename, const char *mount_point, const char *clientname, const char *ipaddr, + const char *group_name, const char *smbuser, const char *smbpasswd,uid_t uid,gid_t gid, + mode_t filemode,mode_t dirmode,int port,const char *supasswd); extern void smb_mount_memorized(char *mount_point,char ** arglist,char gui_mode); extern void stop_all_browse ( void ); extern void stop_all_mount ( void ); @@ -81,12 +81,12 @@ /*if (supasswd!=NULL) use su-command for mount/umount*/ //extern smbmountStateType smbumount(char *mount_point,char *supasswd,char **errstr); //extern smbmountStateType rootumount(char *mount_point,char *supasswd,char **errstr); -void smbumount(char *mount_point,char *supasswd,char smb,int tag); +void smbumount(const char *mount_point,const char *supasswd,char smb,int tag); extern void init_smbmount(void); extern int fdread_line_ok(int fd,int *linec,int *linepos,char *linebuf); -extern char *escape_str(char *s,GSList **strlist); +extern char *escape_str(const char *s,GSList **strlist); extern void log_execvp_str(const char *path, char *const argv[]); diff -urN LinNeighborhood-0.6.5/src/smbmount.c LinNeighborhood-0.6.5-new/src/smbmount.c --- LinNeighborhood-0.6.5/src/smbmount.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/smbmount.c 2004-09-10 11:48:25.000000000 +0100 @@ -75,13 +75,13 @@ unsigned char linux2_0=FALSE; /*Get Version-Info at runtime, 1=kernel<2.1.70*/ -char *escape_str(char *s,GSList **strlist) /*Add escape characters to strings */ +char *escape_str(const char *s,GSList **strlist) /*Add escape characters to strings */ { /* and collect allocated space in strlist*/ static unsigned char need_escaping[] = { ' ','\r','\t','\n','\\','\'','"','&', '*','?','$','(',')','[',']','#','!','`'}; char *ss, *sp; int n; - if (*s==0) return s; +// if (*s==0) return s; n = strlen(s); ss=sp=g_malloc(2*n+1); while(1) { @@ -311,9 +311,9 @@ -void smbmount(char *servicename, char *mount_point,char *clientname,char *ipaddr, - char *group_name,char *smbuser,char *smbpasswd,uid_t uid,gid_t gid, - mode_t filemode,mode_t dirmode,int port,char *supasswd) +void smbmount(const char *servicename, const char *mount_point, const char *clientname, const char *ipaddr, + const char *group_name, const char *smbuser, const char *smbpasswd,uid_t uid,gid_t gid, + mode_t filemode,mode_t dirmode,int port,const char *supasswd) { char notfound[]="smbmount not found\n"; int fdstdin[2],i; @@ -333,7 +333,7 @@ char userpasswd[MAXMNTCOMMANDL]; /*#endif */ MOUNT_STRUCT *mountdat; - char *argv[MAX_ARG+1]; + const char *argv[MAX_ARG+1]; GSList *strlist=NULL; char port_str[16]; @@ -477,6 +477,7 @@ sprintf(commandstr,"mount %s -f %d -d %d -u %d -g %d", /*escape_str_smbmnt(*/mount_point/*,&strlist)*/,filemode,dirmode,uid,gid); } + if ( !is_empty_string(pref.v.smbmount_arg) ) { } @@ -485,8 +486,10 @@ { argv[++argnr]="-o"; argv[++argnr]=commandstr; - sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", - smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr); + sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,debug=0", + smbuser,smbpasswd,filemode,dirmode,uid,gid); +// sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", +// smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr); if (*group_name) { strcat(commandstr,",workgroup="); @@ -533,10 +536,11 @@ dup2(fdstdin[0],STDIN_FILENO); } unsetlangenv(); + if (sumount) - execvp("su",argv); + execvp("su",(char **)argv); else - execvp(pref_get_smbmount_exe(),argv); + execvp(pref_get_smbmount_exe(),(char **)argv); write(STDERR_FILENO,notfound,sizeof(notfound)-1); _exit(0); } @@ -594,7 +598,7 @@ break; } } - log_execvp_str("su",argv); + log_execvp_str("su",(char **)argv); close(fdstdin[0]); write(fdstdin[1], supasswd, strlen(supasswd)); write(fdstdin[1], "\n",1); @@ -649,7 +653,7 @@ } } - log_execvp_str(pref_get_smbmount_exe(),argv); + log_execvp_str(pref_get_smbmount_exe(),(char **)argv); } mountlist=g_slist_append(mountlist,mountdat); mountdat->linepos=0; mountdat->linepos2=0; @@ -866,7 +870,7 @@ -void smbumount(char *mount_point,char *supasswd,char smb,int tag) +void smbumount(const char *mount_point,const char *supasswd,char smb,int tag) { char notfound[]="umount not found\n"; int fdstdin[2],i; @@ -902,7 +906,7 @@ else { argv[0]=smb ? "smbumount":"umount"; - argv[1]=mount_point; + argv[1]=(char *)mount_point; if ( !is_empty_string(pref.v.smbumount_arg) ) { argv[2] = pref.v.smbumount_arg; diff -urN LinNeighborhood-0.6.5/src/utility.c LinNeighborhood-0.6.5-new/src/utility.c --- LinNeighborhood-0.6.5/src/utility.c 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/utility.c 2004-08-31 13:52:40.000000000 +0100 @@ -150,7 +150,7 @@ /* buffer 'dest' must be at least (len + 1) bytes */ -void string_ncopy (char *dest, char *src, size_t len) +void string_ncopy (char *dest, const char *src, size_t len) { if ( !is_empty_string(src) ) strncpy(dest, src, len); @@ -160,7 +160,7 @@ } /* buffer 'dest' must be at least (len + 1) bytes */ -void string_ncat (char *dest, char *src, size_t len) +void string_ncat (char *dest, const char *src, size_t len) { size_t l, diff; @@ -360,13 +360,11 @@ *sp = 0; } -unsigned char is_empty_string (char * str) +unsigned char is_empty_string (const char * str) { int len; int i; - unsigned char ret; - - ret = 1; + if ( str ) { len = strlen(str); @@ -376,18 +374,17 @@ { if ( !whitespace(str[i]) ) { - ret = 0; - break; + return 0; } } } } - return ret; + return 1; } /*--------------------------------------------------------------------------*/ -unsigned char is_ipv4_address (char * str) +unsigned char is_ipv4_address (const char * str) { struct in_addr address; @@ -404,7 +401,7 @@ /*--------------------------------------------------------------------------*/ /* 1 = 'file exists', 0 = 'not exist' */ -unsigned char file_exist (char * filename) +unsigned char file_exist (const char * filename) { FILE *fd; @@ -418,7 +415,7 @@ } /* 1 = 'path exists', 0 = 'not exists' */ -unsigned char path_exist (char *path) +unsigned char path_exist (const char *path) { DIR *dir; @@ -428,7 +425,7 @@ } /* creates a path/directory, 1 = 'success' */ -unsigned char path_create (char *path, mode_t modus) +unsigned char path_create (const char *path, mode_t modus) { char temp[PATH_LEN+1]; char *slashilein; @@ -468,7 +465,7 @@ } /* looks if the path exists, if not -> create */ -unsigned char path_check_create (char *path, mode_t modus) +unsigned char path_check_create (const char *path, mode_t modus) { if ( !path_exist(path) ) { @@ -482,7 +479,7 @@ /*--------------------------------------------------------------------------*/ -static unsigned char compare_smb_name (char *name1, char *name2, int maxlen) +static unsigned char compare_smb_name (const char *name1, const char *name2, int maxlen) { int i; unsigned char ret; @@ -519,17 +516,17 @@ /* 1 = 'groupname equal', 0 = 'groupname not equal' */ -unsigned char compare_smb_groupname (char *group1, char *group2) +unsigned char compare_smb_groupname (const char *group1, const char *group2) { return compare_smb_name(group1, group2, MAXGROUPNAMEL); } -unsigned char compare_smb_sharename (char *share1, char *share2) +unsigned char compare_smb_sharename (const char *share1, const char *share2) { return compare_smb_name(share1, share2, MAXSHRNAMEL); } -unsigned char compare_smb_machinename (char *mach1, char *mach2) +unsigned char compare_smb_machinename (const char *mach1, const char *mach2) { return compare_smb_name(mach1, mach2, MAXMACHNAMEL); } @@ -538,7 +535,7 @@ /* 1 = 'path equal', 0 = 'path not equal' */ -unsigned char compare_path (char * path1, char * path2) +unsigned char compare_path (const char * path1, const char * path2) { unsigned char ret; int len1, len2; @@ -588,7 +585,7 @@ while ( *ctemp == '/' ) ctemp++; - /* beginning of machinen name */ + /* beginning of machine name */ *machine = ctemp; if ( *machine != 0 ) diff -urN LinNeighborhood-0.6.5/src/utility.h LinNeighborhood-0.6.5-new/src/utility.h --- LinNeighborhood-0.6.5/src/utility.h 2002-06-09 08:58:43.000000000 +0100 +++ LinNeighborhood-0.6.5-new/src/utility.h 2004-08-29 23:17:17.000000000 +0100 @@ -46,8 +46,8 @@ extern unsigned char whitespace_sameline(char token); extern char *skip_nonspaces (char *s); -extern void string_ncopy(char *dest, char *src, size_t len); -extern void string_ncat(char *dest, char *src, size_t len); +extern void string_ncopy(char *dest, const char *src, size_t len); +extern void string_ncat(char *dest, const char *src, size_t len); extern void string_trim (char **str); extern void string_trim_left (char **str); extern void string_trim_right (char *str); @@ -57,17 +57,17 @@ extern char *mangle(unsigned char *s); extern void unmangle (char *dest, char *s, int size); -extern unsigned char is_empty_string (char * str); -extern unsigned char is_ipv4_address (char * str); -extern unsigned char file_exist (char * filename); -extern unsigned char path_exist (char *path); -extern unsigned char path_create (char *path, mode_t modus); -extern unsigned char path_check_create (char *path, mode_t modus); - -extern unsigned char compare_smb_groupname (char *group1, char *group2); -extern unsigned char compare_smb_machinename (char *mach1, char *mach2); -extern unsigned char compare_smb_sharename (char *share1, char *share2); -extern unsigned char compare_path (char * path1, char * path2); +extern unsigned char is_empty_string (const char * str); +extern unsigned char is_ipv4_address (const char * str); +extern unsigned char file_exist (const char * filename); +extern unsigned char path_exist (const char *path); +extern unsigned char path_create (const char *path, mode_t modus); +extern unsigned char path_check_create (const char *path, mode_t modus); + +extern unsigned char compare_smb_groupname (const char *group1, const char *group2); +extern unsigned char compare_smb_machinename (const char *mach1, const char *mach2); +extern unsigned char compare_smb_sharename (const char *share1, const char *share2); +extern unsigned char compare_path (const char * path1, const char * path2); extern void merge_smb_service (char **service, char *machine, char *share, size_t len); extern void extract_smb_service (char *service, char **machine, char **share); --- linneighborhood-0.6.5/src/gtk_tree.c~ Tue Oct 19 22:41:41 2004 +++ linneighborhood-0.6.5/src/gtk_tree.c Sun Nov 7 22:00:47 2004 @@ -773,7 +773,7 @@ { size.m_list_h = vpaned->allocation.height - paned->child1_size; } - return TRUE; + return FALSE; } /* ------------------------------------------------------------------------ */