ooo-build r12577 - in branches/ooo-build-2-4: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri May 16 20:18:31 2008
New Revision: 12577
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12577&view=rev

Log:
2008-05-16  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/desktop-disable-startup-registration.diff: disable
	the registration dialog on startup to prevent it from ever showing up 
	(n#391477).

	* patches/src680/apply: apply this patch & rename [ UpdaterRemoval ] to
	[ PopupRemoval ].


Added:
   branches/ooo-build-2-4/patches/src680/desktop-disable-startup-registration.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Fri May 16 20:18:31 2008
@@ -15,7 +15,7 @@
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
 	 OOXML, ImpressFixes, SVGImport, AutoCorrectCapsLock, UnitTesting, \
-     UpdaterRemoval
+     PopupRemoval
 
 LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, SystemBits, \
@@ -826,10 +826,15 @@
 scroll-accel-sc.diff, n#375909, i#71362, kohei
 scroll-accel-vcl.diff, n#375909, i#71362, kohei
 
-[ UpdaterRemoval ]
+[ PopupRemoval ]
+# Remove unnecessary popups that might show up during startup.
+
 # remove updater code that is only relevant for the upstream version.
 sfx2-remove-check-update-on-fileload.diff, kohei
 
+# prevent the registration dialog from showing up on startup.
+desktop-disable-startup-registration.diff, kohei
+
 
 [ EasterEgg ]
 # go-oo.org people active in this release

Added: branches/ooo-build-2-4/patches/src680/desktop-disable-startup-registration.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/desktop-disable-startup-registration.diff	Fri May 16 20:18:31 2008
@@ -0,0 +1,14 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=desktop.vpj desktop.clean/source/app/app.cxx desktop/source/app/app.cxx
+--- desktop.clean/source/app/app.cxx	2008-05-16 15:26:26.000000000 -0400
++++ desktop/source/app/app.cxx	2008-05-16 15:26:38.000000000 -0400
+@@ -1752,8 +1752,10 @@ void Desktop::Main()
+                 }
+             }
+         }
++#if 0
+         else if ( RegistrationPage::hasReminderDateCome() )
+             RegistrationPage::executeSingleMode();
++#endif
+ 
+         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
+