cvs commit: patches/mozilla mozilla-1.4-already_running-1.patch mozilla-1.4-default_plugin_less_annoying-1.patch mozilla-1.4-wallet-1.patch mozilla-1.4-already-running.patch mozilla-1.4-default-plugin-less-annoying.patch mozilla-1.4-wallet.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Jun 7 10:46:41 PDT 2004


jim         04/06/07 11:46:41

  Added:       mozilla  mozilla-1.4-already_running-1.patch
                        mozilla-1.4-default_plugin_less_annoying-1.patch
                        mozilla-1.4-wallet-1.patch
  Removed:     mozilla  mozilla-1.4-already-running.patch
                        mozilla-1.4-default-plugin-less-annoying.patch
                        mozilla-1.4-wallet.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/mozilla/mozilla-1.4-already_running-1.patch
  
  Index: mozilla-1.4-already_running-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-05
  Initial Package Version: 1.0
  Origin: http://bugzilla.mozilla.org/show_bug.cgi?id=122698
  Description: Patch to check if there is already a running instance of mozilla on startup
  diff -Nur mozilla.orig/build/unix/run-mozilla.sh mozilla/build/unix/run-mozilla.sh
  --- mozilla.orig/build/unix/run-mozilla.sh	2002-05-24 17:41:59.000000000 -0500
  +++ mozilla/build/unix/run-mozilla.sh	2002-07-14 10:36:03.000000000 -0500
  @@ -65,10 +65,11 @@
   #
   cmdname=`basename "$0"`
   MOZ_DIST_BIN=`dirname "$0"`
  -MOZ_DEFAULT_NAME="./${cmdname}-bin"
  -MOZ_APPRUNNER_NAME="./mozilla-bin"
  -MOZ_VIEWER_NAME="./viewer"
  +MOZ_DEFAULT_NAME="${MOZ_DIST_BIN}/${cmdname}-bin"
  +MOZ_APPRUNNER_NAME="${MOZ_DIST_BIN}/mozilla-bin"
  +MOZ_VIEWER_NAME="${MOZ_DIST_BIN}/viewer"
   MOZ_PROGRAM=""
  +MOZ_CLIENT_PROGRAM="${MOZ_DIST_BIN}/mozilla-xremote-client"
   
   exitcode=0
   #
  @@ -131,6 +132,18 @@
   	return 0
   }
   ##########################################################################
  +function check_running() {
  +    $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
  +    RETURN_VAL=$?
  +    if [ "$RETURN_VAL" -eq "2" ]; then
  +      echo 0
  +      return 0
  +    else
  +      echo 1
  +      return 1
  +    fi
  +}
  +##########################################################################
   moz_get_debugger()
   {
   	debuggers="ddd gdb dbx bdb"
  @@ -349,6 +362,7 @@
   ## Set MOZILLA_FIVE_HOME
   ##
   MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
  +export XPCOM_CHECK_THREADSAFE=0
   
   if [ -z "$MRE_HOME" ]; then
       MRE_HOME=$MOZILLA_FIVE_HOME
  @@ -429,9 +443,46 @@
   
   if [ $moz_debug -eq 1 ]
   then
  -	moz_debug_program ${1+"$@"}
  +  moz_debug_program ${1+"$@"}
   else
  -	moz_run_program ${1+"$@"}
  +  USE_EXIST=1
  +  ALREADY_RUNNING=`check_running`
  +  if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -n "$1" ]; then
  +    USE_EXIST=0
  +    opt="$1"
  +    case "$opt" in
  +      -mail)
  +        exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)'
  +        ;;
  +      -compose)
  +        exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)'
  +        ;;
  +      -*) ;;
  +      *) USE_EXIST=1 ;;
  +    esac
  +  fi
  +  if [ "${ALREADY_RUNNING}" -eq "1" ] && [ "${USE_EXIST}" -eq "1" ]; then
  +    # If there is no command line argument at all then try to open a new
  +    # window in an already running instance.
  +    if [ -z "$1" ]; then
  +      exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)"
  +    fi
  +
  +    # check to make sure that the command contains at least a :/ in it.
  +    echo $opt | grep -e ':/' 2>/dev/null > /dev/null
  +    RETURN_VAL=$?
  +    if [ "$RETURN_VAL" -eq "1" ]; then
  +      # if it doesn't begin with a '/' and it exists when the pwd is
  +      # prepended to it then append the full path
  +      echo $opt | grep -e '^/' 2>/dev/null > /dev/null
  +      if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then
  +        opt="`pwd`/$opt"
  +      fi
  +      exec $MOZ_CLIENT_PROGRAM "openurl($opt)"
  +    fi
  +    exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)"
  +  fi
  +  moz_run_program ${1+"$@"}
   fi
   
   exit $exitcode
  
  
  
  1.1                  patches/mozilla/mozilla-1.4-default_plugin_less_annoying-1.patch
  
  Index: mozilla-1.4-default_plugin_less_annoying-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-05
  Initial Package Version: 1.0
  Origin: Redhat RPM
  Description: Patch to stop the annonying messagebox everytime a missing plugin is detected.
  --- mozilla/modules/plugin/samples/default/unix/npshell.c.foo	Tue May  7 14:18:45 2002
  +++ mozilla/modules/plugin/samples/default/unix/npshell.c	Tue May  7 14:49:55 2002
  @@ -224,7 +224,7 @@
         This->depth = ws_info->depth;
         This->colormap = ws_info->colormap;
         makePixmap(This);
  -      makeWidget(This);
  +      /* makeWidget(This); */
       }
       return NPERR_NO_ERROR;
   }
  --- mozilla/modules/plugin/samples/default/unix/nullplugin.c.foo	Tue May  7 14:18:45 2002
  +++ mozilla/modules/plugin/samples/default/unix/nullplugin.c	Tue May  7 14:48:33 2002
  @@ -70,6 +70,8 @@
   
       gtk_object_remove_data(GTK_OBJECT(button), DIALOGID);
   
  +#if 0
  +
       if (This->pluginsFileUrl != NULL)
       {
           /* Get the JavaScript command string */
  @@ -110,6 +112,7 @@
               NPN_MemFree(url);
           }
       }
  +#endif
       destroyWidget(This);
   }
   
  @@ -265,14 +268,14 @@
                      GTK_DIALOG(dialogWindow)->action_area);
       gtk_object_set_data(GTK_OBJECT(okButton), DIALOGID, dialogWindow);
   
  -    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
  -                   GTK_DIALOG(dialogWindow)->action_area);
  +    /*    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
  +          GTK_DIALOG(dialogWindow)->action_area); */
   
       gtk_signal_connect (GTK_OBJECT(okButton),  "clicked",
                           GTK_SIGNAL_FUNC(DialogOKClicked), This);
   
  -    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
  -                        GTK_SIGNAL_FUNC(DialogCancelClicked), This);
  +    /*    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
  +          GTK_SIGNAL_FUNC(DialogCancelClicked), This); */
   
       /* hookup to when the dialog is destroyed */
       gtk_signal_connect(GTK_OBJECT(dialogWindow), "destroy",
  --- mozilla/modules/plugin/samples/default/unix/nullplugin.h.foo	Tue May  7 14:46:48 2002
  +++ mozilla/modules/plugin/samples/default/unix/nullplugin.h	Tue May  7 14:47:08 2002
  @@ -53,9 +53,7 @@
   #define JVM_MINETYPE        "application/x-java-vm"
   #define MESSAGE "\
   This page contains information of a type (%s) that can\n\
  -only be viewed with the appropriate Plug-in.\n\
  -\n\
  -Click OK to download Plugin."
  +only be viewed with the appropriate Plug-in."
   
   #define GET 1
   #define REFRESH 2
  
  
  
  1.1                  patches/mozilla/mozilla-1.4-wallet-1.patch
  
  Index: mozilla-1.4-wallet-1.patch
  ===================================================================
  Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
  Date: 2003-10-05
  Initial Package Version: 1.0
  Origin: Mozilla Development Archives
  Description: Patch to allow mozilla to store passwords even if it is explicitly disabled using the non-standard autocomplete=off option
  diff -Nur mozilla.orig/extensions/wallet/src/wallet.cpp mozilla/extensions/wallet/src/wallet.cpp
  --- mozilla.orig/extensions/wallet/src/wallet.cpp	2002-05-13 17:07:55.000000000 -0500
  +++ mozilla/extensions/wallet/src/wallet.cpp	2002-07-14 10:31:18.000000000 -0500
  @@ -4002,7 +4002,7 @@
                         isPassword = PR_FALSE;
                       }
                     }
  -#define WALLET_DONT_CACHE_ALL_PASSWORDS
  +/* #define WALLET_DONT_CACHE_ALL_PASSWORDS */
   #ifdef WALLET_DONT_CACHE_ALL_PASSWORDS
                     // Do not store this form element if the 'autocomplete = off' attibute is present, 
                     // unless both wallet encryption and 'wallet.crypto.autocompleteoverride' are enabled.
  
  
  



More information about the patches mailing list