381.09381.09

5 files changed, 1 insertions, 27 deletions

diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index 1b69757..8e7a40a 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -536,10 +536,6 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                 break;
             }
 
-        case LOGO_PATH_OPTION:
-            op->logo_path = disable ? NV_DISABLE_STRING_OPTION : strval;
-            break;
-  
         case USE_DISPLAY_DEVICE_OPTION:
             op->use_display_device = 
                 disable ? NV_DISABLE_STRING_OPTION : strval;
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index c44c302..ff67787 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -31,7 +31,6 @@
 
 
 /* Boolean options */
-#define NOLOGO_BOOL_OPTION                      0
 #define UBB_BOOL_OPTION                         1
 #define RENDER_ACCEL_BOOL_OPTION                2
 #define NO_RENDER_EXTENSION_BOOL_OPTION         3
@@ -137,7 +136,6 @@ typedef struct __options {
     char *extract_edids_from_file;
     char *extract_edids_output_file;
     char *nvidia_xinerama_info_order;
-    char *logo_path;
     char *metamode_orientation;
     char *use_display_device;
     char *custom_edid;
diff --git a/option_table.h b/option_table.h
index b8ab06b..c0735fa 100644
--- a/option_table.h
+++ b/option_table.h
@@ -34,7 +34,6 @@ enum {
     EXTRACT_EDIDS_OUTPUT_FILE_OPTION,
     MULTI_GPU_OPTION,
     NVIDIA_XINERAMA_INFO_ORDER_OPTION,
-    LOGO_PATH_OPTION,
     METAMODE_ORIENTATION_OPTION,
     VIRTUAL_OPTION,
     USE_DISPLAY_DEVICE_OPTION,
@@ -346,15 +345,6 @@ static const NVGetoptOption __options[] = {
       "not specified, the first Server Layout in the X configuration "
       "file is used." },
 
-    { "logo",
-      XCONFIG_BOOL_VAL(NOLOGO_BOOL_OPTION), NVGETOPT_IS_BOOLEAN, NULL,
-      "Disable or enable the \"NoLogo\" X configuration option." },
-
-    { "logo-path", LOGO_PATH_OPTION,
-      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, "PATH",
-      "Set the path to the PNG file to be used as the logo splash screen at X "
-      "server startup." },
-
     { "mode",
       MODE_OPTION, NVGETOPT_IS_BOOLEAN | NVGETOPT_STRING_ARGUMENT, NULL,
       "Add the specified mode to the mode list." },
diff --git a/options.c b/options.c
index 47bef66..53fdccc 100644
--- a/options.c
+++ b/options.c
@@ -37,7 +37,6 @@ typedef struct {
 
 static const NvidiaXConfigOption __options[] = {
     
-    { NOLOGO_BOOL_OPTION,                    TRUE,  "NoLogo" },
     { UBB_BOOL_OPTION,                       FALSE, "UBB" },
     { RENDER_ACCEL_BOOL_OPTION,              FALSE, "RenderAccel" },
     { NO_RENDER_EXTENSION_BOOL_OPTION,       TRUE,  "NoRenderExtension" },
@@ -610,16 +609,7 @@ void update_options(Options *op, XConfigScreenPtr screen)
             }
         }
     }
-    
-    /* add the LogoPath option */
 
-    if (op->logo_path) {
-        remove_option(screen, "LogoPath");
-        if (op->logo_path != NV_DISABLE_STRING_OPTION) {
-            set_option_value(screen, "LogoPath", op->logo_path);
-        }
-    }
-   
     /* add the UseDisplayDevice option */
  
     if (op->use_display_device) {
diff --git a/version.mk b/version.mk
index 3ad7ef3..e21b358 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 378.13
+NVIDIA_VERSION = 381.09