Changeset 6200 in vbox

Timestamp:

Dec 28, 2007 1:28:08 PM (17 years ago)

Author:

vboxsync

Message:

Added VBOX_WITH_REGISTRATION_REQUEST which can be used to disable the registration request on startup. The menu entry remains and the user has the choice to register voluntary. This switch is meant for OSE builds.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (3 diffs)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -33 +33 @@
 IMAGES :=
 
+VBOX_WITH_REGISTRATION := 1
+VBOX_WITH_REGISTRATION_REQUEST := 1
+
 DEPTH = ../../../..
 include $(PATH_KBUILD)/header.kmk
@@ -40 +43 @@
 # exclude inappropriate UI content
 #
-#ifndef VBOX_OSE
-VBOX_WITH_REGISTRATION := 1
-#endif
-
 ifndef VBOX_WITH_REGISTRATION
 VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS))
@@ -238 +237 @@
  VirtualBox_DEFS         += VBOX_WITH_REGISTRATION
 endif
+ifdef VBOX_WITH_REGISTRATION_REQUEST
+ VirtualBox_DEFS         += VBOX_WITH_REGISTRATION_REQUEST
+endif
 ifdef VBOX_WITH_ALSA
  VirtualBox_DEFS         += VBOX_WITH_ALSA

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -920 +920 @@
     LogFlowFuncLeave();
 
+#ifdef VBOX_WITH_REGISTRATION_REQUEST
     vboxGlobal().showRegistrationDialog (false /* aForce */);
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -243 +243 @@
                 a.setMainWidget (&vboxGlobal().selectorWnd());
                 vboxGlobal().selectorWnd().show();
+#ifdef VBOX_WITH_REGISTRATION_REQUEST
                 vboxGlobal().showRegistrationDialog (false /* aForce */);
+#endif
                 vboxGlobal().startEnumeratingMedia();
                 rc = a.exec();