337.25337.25

16 files changed, 14 insertions, 563 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 5b4f9bc..dea0f65 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.19
+NVIDIA_VERSION = 337.25
diff --git a/samples/version.mk b/samples/version.mk
index 5b4f9bc..dea0f65 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.19
+NVIDIA_VERSION = 337.25
diff --git a/src/gtk+-2.x/ctkappprofile.c b/src/gtk+-2.x/ctkappprofile.c
index 6116518..8b7d224 100644
--- a/src/gtk+-2.x/ctkappprofile.c
+++ b/src/gtk+-2.x/ctkappprofile.c
@@ -975,6 +975,9 @@ static void populate_source_combo_box(CtkAppProfile *ctk_app_profile,
     size_t i, size;
     json_t *json_filename, *json_filenames;
 
+    gtk_list_store_clear(GTK_LIST_STORE(gtk_combo_box_get_model(
+        GTK_COMBO_BOX(combo_box_entry))));
+
     json_filenames = nv_app_profile_config_get_source_filenames(ctk_app_profile->cur_config);
 
     for (i = 0, size = json_array_size(json_filenames); i < size; i++) {
@@ -1053,6 +1056,10 @@ static void edit_rule_dialog_load_profile(EditRuleDialog *dialog,
 
     // profile name
     combo_box_entry = GTK_COMBO_BOX_ENTRY(dialog->profile_name_combo);
+
+    gtk_list_store_clear(GTK_LIST_STORE(gtk_combo_box_get_model(
+        GTK_COMBO_BOX(combo_box_entry))));
+
     gtk_tree_model_foreach(GTK_TREE_MODEL(ctk_app_profile->apc_profile_model),
                            append_profile_name,
                            (gpointer)combo_box_entry);
diff --git a/src/gtk+-2.x/ctkclocks.c b/src/gtk+-2.x/ctkclocks.c
index bcee633..5a3e16b 100644
--- a/src/gtk+-2.x/ctkclocks.c
+++ b/src/gtk+-2.x/ctkclocks.c
@@ -26,7 +26,6 @@
 
 #include "ctkclocks.h"
 
-#include "ctklicense.h"
 #include "ctkscale.h"
 #include "ctkhelp.h"
 #include "ctkevent.h"
@@ -83,8 +82,6 @@ static void clocks_received(GtkObject *object, gpointer arg1,
 
 /**** GLOBALS ****************************************************************/
 
-static gboolean __license_accepted = FALSE;
-
 /* Tooltips */
 
 static const char * __enable_button_help =
@@ -288,10 +285,6 @@ GtkWidget* ctk_clocks_new(NvCtrlAttributeHandle *handle,
     ctk_object->auto_detection_available  = auto_detection_available;
     ctk_object->probing_optimal      = probing_optimal;
 
-    if ( overclocking_enabled ) {
-        __license_accepted = TRUE;
-    }
-
     /* Create the Clock menu widget */
 
     menu = (CtkDropDownMenu *)
@@ -451,11 +444,6 @@ GtkWidget* ctk_clocks_new(NvCtrlAttributeHandle *handle,
 
     gtk_widget_set_sensitive(ctk_object->reset_button, False);
 
-    /* Create the enable dialog */
-
-    ctk_object->license_dialog = ctk_license_dialog_new(GTK_WIDGET(ctk_object),
-                                                        "Clock Frequencies");
-
     /* Create the auto detect dialog */
 
     ctk_object->detect_dialog =
@@ -792,7 +780,6 @@ static void overclocking_state_toggled(GtkWidget *widget, gpointer user_data)
     CtkClocks *ctk_object = CTK_CLOCKS(user_data);
     gboolean enabled;
     int value;
-    gint result;
     
     /* Get enabled state */
 
@@ -801,37 +788,6 @@ static void overclocking_state_toggled(GtkWidget *widget, gpointer user_data)
     value = (enabled==1) ? NV_CTRL_GPU_OVERCLOCKING_STATE_MANUAL :
         NV_CTRL_GPU_OVERCLOCKING_STATE_NONE;
 
-    /* Verify user knows the risks involved */
-
-    if ( enabled && !__license_accepted ) {
-
-        result = 
-            ctk_license_run_dialog(CTK_LICENSE_DIALOG(ctk_object->license_dialog)); 
-        
-        switch (result)
-        {
-        case GTK_RESPONSE_ACCEPT:
-            __license_accepted = TRUE;
-            break;
-            
-        case GTK_RESPONSE_REJECT:
-        default:
-            /* Cancel */
-            g_signal_handlers_block_by_func(G_OBJECT(ctk_object->enable_checkbox),
-                                            G_CALLBACK(overclocking_state_toggled),
-                                            (gpointer) ctk_object);
-            
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
-                                         FALSE);
-            
-            g_signal_handlers_unblock_by_func(G_OBJECT(ctk_object->enable_checkbox),
-                                              G_CALLBACK(overclocking_state_toggled),
-                                              (gpointer) ctk_object);
-            return;
-        }
-    }
-
-    
     /* Update the server */
 
     NvCtrlSetAttribute(ctk_object->handle,
diff --git a/src/gtk+-2.x/ctkclocks.h b/src/gtk+-2.x/ctkclocks.h
index c126093..872a04e 100644
--- a/src/gtk+-2.x/ctkclocks.h
+++ b/src/gtk+-2.x/ctkclocks.h
@@ -57,12 +57,8 @@ struct _CtkClocks
     NvCtrlAttributeHandle *handle;
     CtkConfig *ctk_config;
 
-    GtkWidget *license_dialog;
     GtkWidget *detect_dialog;
 
-    GtkWidget *license_window;
-
-
     GtkWidget *enable_checkbox;  /* Overclocking available */
     GtkWidget *clock_menu;       /* 2D/3D dropdown selector */
 
diff --git a/src/gtk+-2.x/ctklicense.c b/src/gtk+-2.x/ctklicense.c
deleted file mode 100644
index 233cdcd..0000000
--- a/src/gtk+-2.x/ctklicense.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
- * and Linux systems.
- *
- * Copyright (C) 2009 NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses>.
- */
-
-/**** INCLUDES ***************************************************************/
-
-#include <gtk/gtk.h>
-#include <NvCtrlAttributes.h>
-
-#include "ctklicense.h"
-#include "ctkutils.h"
-
-#include "ctkconfig.h"
-#include "ctkhelp.h"
-#include "ctkbanner.h"
-
-static const char * __license_pre_msg =
-"Please read and accept the following license agreement:";
-
-static const char * __license_msg =
-"<b>TERMS AND CONDITIONS</b>\n"
-"\n"
-"WARNING: THE SOFTWARE UTILITY YOU ARE ABOUT TO "
-"ENABLE (\"UTILITY\") MAY CAUSE SYSTEM DAMAGE AND "
-"VOID WARRANTIES.  THIS UTILITY RUNS YOUR COMPUTER "
-"SYSTEM OUT OF THE MANUFACTURER'S DESIGN "
-"SPECIFICATIONS, INCLUDING, BUT NOT LIMITED TO: "
-"HIGHER SYSTEM VOLTAGES, ABOVE NORMAL "
-"TEMPERATURES, EXCESSIVE FREQUENCIES, AND "
-"CHANGES TO BIOS THAT MAY CORRUPT THE BIOS.  YOUR "
-"COMPUTER'S OPERATING SYSTEM MAY HANG AND RESULT "
-"IN DATA LOSS OR CORRUPTED IMAGES.  DEPENDING ON "
-"THE MANUFACTURER OF YOUR COMPUTER SYSTEM, THE "
-"COMPUTER SYSTEM, HARDWARE AND SOFTWARE "
-"WARRANTIES MAY BE VOIDED, AND YOU MAY NOT "
-"RECEIVE ANY FURTHER MANUFACTURER SUPPORT."
-"NVIDIA DOES NOT PROVIDE CUSTOMER SERVICE SUPPORT "
-"FOR THIS UTILITY.  IT IS FOR THESE REASONS THAT "
-"ABSOLUTELY NO WARRANTY OR GUARANTEE IS EITHER "
-"EXPRESS OR IMPLIED.  BEFORE ENABLING AND USING, YOU "
-"SHOULD DETERMINE THE SUITABILITY OF THE UTILITY "
-"FOR YOUR INTENDED USE, AND YOU SHALL ASSUME ALL "
-"RESPONSIBILITY IN CONNECTION THEREWITH."
-"\n"
-"\n"
-"<b>DISCLAIMER OF WARRANTIES</b>\n"
-"\n"
-"ALL MATERIALS, INFORMATION, AND SOFTWARE "
-"PRODUCTS, INCLUDED IN OR MADE AVAILABLE THROUGH "
-"THIS UTILITY ARE PROVIDED \"AS IS\" AND \"AS AVAILABLE\" "
-"FOR YOUR USE.  THE UTILITY IS PROVIDED WITHOUT "
-"WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, "
-"INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF "
-"MERCHANTABILITY, FITNESS FOR A PARTICULAR "
-"PURPOSE, OR NONINFRINGEMENT.  NVIDIA AND ITS "
-"SUBSIDIARIES DO NOT WARRANT THAT THE UTILITY IS "
-"RELIABLE OR CORRECT; THAT ANY DEFECTS OR ERRORS "
-"WILL BE CORRECTED; OR THAT THE UTILITY IS FREE OF "
-"VIRUSES OR OTHER HARMFUL COMPONENTS.  YOUR USE "
-"OF THE UTILITY IS SOLELY AT YOUR RISK.  BECAUSE SOME "
-"JURISDICTIONS DO NOT PERMIT THE EXCLUSION OF "
-"CERTAIN WARRANTIES, THESE EXCLUSIONS MAY NOT "
-"APPLY TO YOU."
-"\n"
-"\n"
-"<b>LIMITATION OF LIABILITY</b>\n"
-"\n"
-"UNDER NO CIRCUMSTANCES SHALL NVIDIA AND ITS "
-"SUBSIDIARIES BE LIABLE FOR ANY DIRECT, INDIRECT, "
-"PUNITIVE, INCIDENTAL, SPECIAL, OR CONSEQUENTIAL "
-"DAMAGES THAT RESULT FROM THE USE OF, OR INABILITY "
-"TO USE, THE UTILITY.  THIS LIMITATION APPLIES WHETHER "
-"THE ALLEGED LIABILITY IS BASED ON CONTRACT, TORT, "
-"NEGLIGENCE, STRICT LIABILITY, OR ANY OTHER BASIS, "
-"EVEN IF NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF "
-"SUCH DAMAGE.  BECAUSE SOME JURISDICTIONS DO NOT "
-"ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR "
-"CONSEQUENTIAL DAMAGES, NVIDIA'S LIABILITY IN SUCH "
-"JURISDICTIONS SHALL BE LIMITED TO THE EXTENT "
-"PERMITTED BY LAW."
-"\n"
-"IF YOU HAVE READ, UNDERSTOOD, AND AGREE TO ALL OF "
-"THE ABOVE TERMS AND CONDITIONS, CLICK THE \"YES\" "
-"BUTTON BELOW."
-"\n"
-"IF YOU DO NOT AGREE WITH ALL OF THE ABOVE TERMS "
-"AND CONDITIONS, THEN CLICK ON THE \"NO\" BUTTON "
-"BELOW, AND DO NOT ENABLE OR USE THE UTILITY.";
-
-GType ctk_license_dialog_get_type(void)
-{
-    static GType ctk_license_dialog_type = 0;
-
-    if (!ctk_license_dialog_type) {
-        static const GTypeInfo ctk_license_dialog_info = {
-            sizeof (CtkLicenseDialogClass),
-            NULL, /* base_init */
-            NULL, /* base_finalize */
-            NULL, /* class_init, */
-            NULL, /* class_finalize */
-            NULL, /* class_data */
-            sizeof (CtkLicenseDialog),
-            0, /* n_preallocs */
-            NULL, /* instance_init */
-            NULL  /* value_table */
-        };
-
-        ctk_license_dialog_type = g_type_register_static(GTK_TYPE_VBOX,
-                                                         "CtkLicenseDialog",
-                                                         &ctk_license_dialog_info,
-                                                         0);
-    }
-
-    return ctk_license_dialog_type;
-}
-
-
-
-/*****
- *
- * Callback Function - This function gets called when the user scrolls
- * the license agreement text.  Once the user has scrolled to the end
- * of the document, the YES button is activated.
- *
- */
-static void license_scrolled(GtkRange *range,
-                             gpointer user_data)
-{
-    CtkLicenseDialog *ctk_license_dialog = CTK_LICENSE_DIALOG(user_data);
-    GtkAdjustment *adj = gtk_range_get_adjustment(range);
-
-
-    /* Enable the dialog's "YES" button once user reaches end of license */
-
-    if ( adj->value + adj->page_size >= adj->upper ) {
-
-        gtk_dialog_set_response_sensitive(GTK_DIALOG(
-                                                     ctk_license_dialog->dialog),
-                                          GTK_RESPONSE_ACCEPT,
-                                          TRUE);
-    }
-}
-
-
-
-/*****
- *
- * ctk_license_run_dialog() - Resize license dialog window and run license
- * dialog. 
- * 
- */
-gint ctk_license_run_dialog(CtkLicenseDialog *ctk_license_dialog)
-{
-
-    gint w, h;
-    gint result;
-    GtkRange *range;
-    GtkAdjustment *adj;
-    GdkScreen * s =
-        gtk_window_get_screen(GTK_WINDOW(GTK_DIALOG(ctk_license_dialog->dialog)));
-
-    /* Reset dialog window size */
-    
-    gtk_window_get_size(GTK_WINDOW(GTK_DIALOG(ctk_license_dialog->dialog)),
-                        &w, &h);
-
-    /* Make license dialog default to 55% of the screen height */
-
-    h = (gint)(0.55f * gdk_screen_get_height(s));
-    w = 1;
-
-    gtk_window_resize(GTK_WINDOW(GTK_DIALOG(ctk_license_dialog->dialog)),
-                      w, h);
-
-    /* Reset scroll bar to the top */
-
-    range =
-        GTK_RANGE(GTK_SCROLLED_WINDOW(ctk_license_dialog->window)->vscrollbar);
-    adj = gtk_range_get_adjustment(range);
-
-    gtk_adjustment_set_value(adj, 0.0f);
-
-    gtk_widget_show_all(ctk_license_dialog->dialog);
-    
-    
-    /* Sensitize the YES button */
-
-    if ( adj->page_size >= adj->upper ) {
-        gtk_dialog_set_response_sensitive(GTK_DIALOG(
-                                          ctk_license_dialog->dialog),
-                                          GTK_RESPONSE_ACCEPT,
-                                          TRUE);
-    } else {
-        gtk_dialog_set_response_sensitive(GTK_DIALOG(
-                                          ctk_license_dialog->dialog),
-                                          GTK_RESPONSE_ACCEPT,
-                                          FALSE);
-    }
-    
-    result = gtk_dialog_run (GTK_DIALOG(ctk_license_dialog->dialog));
-    
-    gtk_widget_hide_all(ctk_license_dialog->dialog);
-
-    return result;
-}
-
-
-
-GtkWidget* ctk_license_dialog_new(GtkWidget *parent, gchar *panel_name)
-{
-    GObject *object;
-    CtkLicenseDialog *ctk_license_dialog;
-
-    GtkWidget *hbox, *label, *scrollWin, *event;
-    gchar *enable_message;
-
-    object = g_object_new(CTK_TYPE_LICENSE_DIALOG, NULL);
-    ctk_license_dialog = CTK_LICENSE_DIALOG(object);
-    
-    /* Create the enable dialog */
-
-    ctk_license_dialog->dialog =
-        gtk_dialog_new_with_buttons("License Agreement",
-                                    GTK_WINDOW(gtk_widget_get_parent(
-                                               GTK_WIDGET(parent))),
-                                    GTK_DIALOG_MODAL |
-                                    GTK_DIALOG_DESTROY_WITH_PARENT |
-                                    GTK_DIALOG_NO_SEPARATOR,
-                                    GTK_STOCK_YES,
-                                    GTK_RESPONSE_ACCEPT,
-                                    GTK_STOCK_NO,
-                                    GTK_RESPONSE_REJECT,
-                                    NULL
-                                   );
-    
-    hbox = gtk_hbox_new(TRUE, 10);
-    label = gtk_label_new(__license_pre_msg);
-
-    gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 10);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(
-                        ctk_license_dialog->dialog)->vbox),
-                       hbox, FALSE, FALSE, 10);
-
-    scrollWin = gtk_scrolled_window_new(NULL, NULL);
-    hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new("");
-    event = gtk_event_box_new();
-    ctk_force_text_colors_on_widget(event);
-    ctk_license_dialog->window = scrollWin;
-
-    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_label_set_markup(GTK_LABEL(label), __license_msg);
-
-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollWin),
-                                   GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
-    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-    gtk_container_add(GTK_CONTAINER(event), hbox);
-    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollWin),
-                                          event);
-    hbox = gtk_hbox_new(TRUE, 10);
-    gtk_box_pack_start(GTK_BOX(hbox), scrollWin, TRUE, TRUE, 10);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(ctk_license_dialog->dialog)->vbox),
-                       hbox, TRUE, TRUE, 10);
-    hbox = gtk_hbox_new(FALSE, 10);
-    enable_message = g_strdup_printf("To use the features on the %s panel you\n"
-                                     "must agree to the terms of the preceding "
-                                     "license agreement.\nDo you accept this "
-                                     "agreement?", panel_name);
-    label = gtk_label_new(enable_message);
-    g_free(enable_message);
-
-    gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 15);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(ctk_license_dialog->dialog)->vbox),
-                       hbox, FALSE, FALSE, 10);
-    
-    g_signal_connect((gpointer)
-                     GTK_RANGE(GTK_SCROLLED_WINDOW(scrollWin)->vscrollbar),
-                     "value_changed",
-                     G_CALLBACK(license_scrolled),
-                     (gpointer) ctk_license_dialog);
-    
-    return GTK_WIDGET(object);
-
-} /* ctk_license_dialog_new() */
-
diff --git a/src/gtk+-2.x/ctklicense.h b/src/gtk+-2.x/ctklicense.h
deleted file mode 100644
index 73fde70..0000000
--- a/src/gtk+-2.x/ctklicense.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
- * and Linux systems.
- *
- * Copyright (C) 2009 NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses>.
- */
-
-#ifndef __CTK_LICENSE_DIALOG_H__
-#define __CTK_LICENSE_DIALOG_H__
-
-#include "ctkevent.h"
-#include "ctkconfig.h"
-
-G_BEGIN_DECLS
-
-#define CTK_TYPE_LICENSE_DIALOG (ctk_license_dialog_get_type())
-
-#define CTK_LICENSE_DIALOG(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), CTK_TYPE_LICENSE_DIALOG, \
-                                 CtkLicenseDialog))
-
-#define CTK_LICENSE_DIALOG_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), CTK_TYPE_LICENSE_DIALOG, \
-                              CtkLicenseDialogClass))
-
-#define CTK_IS_LICENSE_DIALOG(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CTK_TYPE_LICENSE_DIALOG))
-
-#define CTK_IS_LICENSE_DIALOG_CLASS(class) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), CTK_TYPE_LICENSE_DIALOG))
-
-#define CTK_LICENSE_DIALOG_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_LICENSE_DIALOG, \
-                                CtkLicenseDialogClass))
-
-typedef struct _CtkLicenseDialog       CtkLicenseDialog;
-typedef struct _CtkLicenseDialogClass  CtkLicenseDialogClass;
-
-struct _CtkLicenseDialog
-{
-    GtkVBox parent;
-    
-    GtkWidget *window;
-    GtkWidget *dialog;
-};
-
-struct _CtkLicenseDialogClass
-{
-    GtkVBoxClass parent_class;
-};
-
-GType       ctk_license_dialog_get_type  (void) G_GNUC_CONST;
-GtkWidget*  ctk_license_dialog_new       (GtkWidget *object, gchar *panel_name);
-gint ctk_license_run_dialog(CtkLicenseDialog *ctk_license_dialog);
-
-G_END_DECLS
-
-#endif /* __CTK_LICENSE_DIALOG_H__ */
diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c
index 9bfee62..42c8a94 100644
--- a/src/gtk+-2.x/ctkpowermizer.c
+++ b/src/gtk+-2.x/ctkpowermizer.c
@@ -28,7 +28,6 @@
 #include "ctkutils.h"
 #include "ctkhelp.h"
 #include "ctkpowermizer.h"
-#include "ctklicense.h"
 #include "ctkbanner.h"
 #include "ctkdropdownmenu.h"
 
@@ -64,9 +63,6 @@ static void offset_value_changed_event_received(GtkObject *object,
 
 static void update_editable_perf_level_info(CtkPowermizer *ctk_powermizer);
 
-static void enable_perf_level_editing_toggled(GtkWidget *widget,
-                                              gpointer user_data);
-
 static const char *__adaptive_clock_help =
 "The Adaptive Clocking status describes if this feature "
 "is currently enabled in this GPU.";
@@ -101,12 +97,6 @@ static const char *__performance_levels_table_help =
 "performance level is shown in regular text.  All other performance "
 "levels are shown in gray.";
 
-static const char * __enable_button_help =
-"The 'Enable Performance Level Editing' checkbox allows manipulation "
-"of an over- and under-clocking offset.  This option is only available "
-"when the 'Coolbits' X configuration option is set to '8'."
-"  Overclocking your GPU is not recommended and is done at your own risk.";
-
 static const char *__editable_performance_levels_table_help =
 "Each Performance Level that allows clock modifications will allow custom "
 "offsets to be applied to the Graphics clock and Memory Transfer Rate."
@@ -288,48 +278,6 @@ static void post_set_attribute_offset_value(CtkPowermizer *ctk_powermizer,
 
 
 
-static void enable_perf_level_editing_toggled(GtkWidget *widget,
-                                              gpointer user_data)
-{
-    CtkPowermizer *ctk_powermizer = CTK_POWERMIZER(user_data);
-    gboolean enabled;
-    gint result;
-
-    /* Get enabled state */
-
-    enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-
-    /* Verify user knows the risks involved */
-
-    if (enabled && !ctk_powermizer->license_accepted) {
-
-        result = ctk_license_run_dialog(CTK_LICENSE_DIALOG(ctk_powermizer->enable_dialog));
-
-        switch (result) {
-        case GTK_RESPONSE_ACCEPT:
-            ctk_powermizer->license_accepted = TRUE;
-            break;
-        case GTK_RESPONSE_REJECT:
-        default:
-            /* Cancel */
-            g_signal_handlers_block_by_func(G_OBJECT(widget),
-                                            G_CALLBACK(enable_perf_level_editing_toggled),
-                                            (gpointer) ctk_powermizer);
-
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), FALSE);
-
-            g_signal_handlers_unblock_by_func(G_OBJECT(widget),
-                                              G_CALLBACK(enable_perf_level_editing_toggled),
-                                              (gpointer) ctk_powermizer);
-            return;
-        }
-    }
-    gtk_widget_set_sensitive(ctk_powermizer->editable_perf_level_table,
-                             enabled);
-}
-
-
-
 static void set_attribute_offset_value(GtkWidget *widget,
                                        gpointer user_data)
 {
@@ -409,38 +357,9 @@ static void update_editable_perf_level_info(CtkPowermizer *ctk_powermizer)
     gtk_box_pack_start(GTK_BOX(ctk_powermizer->performance_table_hbox1),
                        vbox, FALSE, FALSE, 0);
 
-    /* Create the enable dialog */
-
-    ctk_powermizer->enable_dialog =
-        ctk_license_dialog_new(GTK_WIDGET(ctk_powermizer),
-                               "Performance Level Editing");
-
-    /* Create the Enable Performance Level Editing checkbox widget */
-
-    ctk_powermizer->enable_checkbox =
-        gtk_check_button_new_with_label("Enable Performance Level Editing");
-
-    gtk_toggle_button_set_active
-        (GTK_TOGGLE_BUTTON(ctk_powermizer->enable_checkbox),
-         FALSE);
-
-    g_signal_connect(G_OBJECT(ctk_powermizer->enable_checkbox), "toggled",
-                     G_CALLBACK(enable_perf_level_editing_toggled),
-                     (gpointer) ctk_powermizer);
-
-    ctk_config_set_tooltip(ctk_powermizer->ctk_config, ctk_powermizer->enable_checkbox,
-                           __enable_button_help);
-
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), ctk_powermizer->enable_checkbox, TRUE, TRUE, 5);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
     gtk_box_pack_start(GTK_BOX(vbox),
                        table, FALSE, FALSE, 5);
 
-    /* Enable access to overclock settings only if license accepted */
-    if (!ctk_powermizer->license_accepted) {
-        gtk_widget_set_sensitive(GTK_WIDGET(table), FALSE);
-    }
     /* create the editable performance level table */
     ctk_powermizer->editable_perf_level_table = table;
 
@@ -1326,7 +1245,6 @@ GtkWidget* ctk_powermizer_new(NvCtrlAttributeHandle *handle,
     ctk_powermizer->pcie_gen_queriable = pcie_gen_queriable;
     ctk_powermizer->hasDecoupledClock = FALSE;
     ctk_powermizer->hasEditablePerfLevel = FALSE;
-    ctk_powermizer->license_accepted = FALSE;
 
     /* set container properties for the CtkPowermizer widget */
 
@@ -2095,8 +2013,6 @@ GtkTextBuffer *ctk_powermizer_create_help(GtkTextTagTable *table,
         ctk_help_para(b, &i, "%s", __performance_levels_table_help);
     }
 
-    ctk_help_heading(b, &i, "Enable overclock Settings");
-    ctk_help_para(b, &i, "%s", __enable_button_help);
     if (ctk_powermizer->hasEditablePerfLevel) {
         ctk_help_heading(b, &i, "Editable Performance Levels (Table)");
         ctk_help_para(b, &i, "%s", __editable_performance_levels_table_help);
diff --git a/src/gtk+-2.x/ctkpowermizer.h b/src/gtk+-2.x/ctkpowermizer.h
index a4e4f7a..7f55fe1 100644
--- a/src/gtk+-2.x/ctkpowermizer.h
+++ b/src/gtk+-2.x/ctkpowermizer.h
@@ -72,13 +72,10 @@ struct _CtkPowermizer
     gboolean  dp_toggle_warning_dlg_shown;
     gboolean  hasDecoupledClock;
     gboolean  hasEditablePerfLevel;
-    gboolean  license_accepted;
     gint      attribute;
     gint      powermizer_default_mode;
     GtkWidget *status;
 
-    GtkWidget *enable_dialog;
-    GtkWidget *enable_checkbox;
     GtkWidget *editable_perf_level_table;
     gint      num_perf_levels;
 
diff --git a/src/gtk+-2.x/ctkthermal.c b/src/gtk+-2.x/ctkthermal.c
index b0a8773..db4d044 100644
--- a/src/gtk+-2.x/ctkthermal.c
+++ b/src/gtk+-2.x/ctkthermal.c
@@ -25,15 +25,12 @@
 #include "ctkscale.h"
 #include "ctkhelp.h"
 #include "ctkthermal.h"
-#include "ctklicense.h"
 #include "ctkgauge.h"
 #include "ctkbanner.h"
 
 #define FRAME_PADDING 10
 #define DEFAULT_UPDATE_THERMAL_INFO_TIME_INTERVAL 1000
 
-static gboolean __license_accepted = FALSE;
-
 static gboolean update_thermal_info(gpointer);
 static gboolean update_cooler_info(gpointer);
 static void sync_gui_sensitivity(CtkThermal *ctk_thermal);
@@ -456,7 +453,6 @@ static void cooler_control_state_toggled(GtkWidget *widget, gpointer user_data)
     CtkThermal *ctk_thermal = CTK_THERMAL(user_data);
     gboolean enabled;
     int value;
-    gint result;
 
     /* Get enabled state */
 
@@ -464,38 +460,6 @@ static void cooler_control_state_toggled(GtkWidget *widget, gpointer user_data)
     value = (enabled==1) ? NV_CTRL_GPU_COOLER_MANUAL_CONTROL_TRUE :
         NV_CTRL_GPU_COOLER_MANUAL_CONTROL_FALSE;
 
-    /* Verify user knows the risks involved */
-
-    if ( enabled && !__license_accepted ) {
-
-        result =
-            ctk_license_run_dialog(CTK_LICENSE_DIALOG(ctk_thermal->enable_dialog));
-
-        switch (result) {
-        case GTK_RESPONSE_ACCEPT:
-            __license_accepted = TRUE;
-            break;
-
-        case GTK_RESPONSE_REJECT:
-        default:
-            /* Cancel */
-            g_signal_handlers_block_by_func(G_OBJECT(
-                                    ctk_thermal->enable_checkbox),
-                                    G_CALLBACK(cooler_control_state_toggled),
-                                    (gpointer) ctk_thermal);
-
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
-                                         FALSE);
-
-            g_signal_handlers_unblock_by_func(G_OBJECT(
-                                    ctk_thermal->enable_checkbox),
-                                    G_CALLBACK(cooler_control_state_toggled),
-                                    (gpointer) ctk_thermal);
-            return;
-        }
-    }
-
-
     /* Update the server */
 
     NvCtrlSetAttribute(ctk_thermal->attribute_handle,
@@ -1215,10 +1179,6 @@ GtkWidget* ctk_thermal_new(NvCtrlAttributeHandle *handle,
     ctk_thermal->cooler_control_enabled = cooler_control_enabled;
     ctk_thermal->enable_reset_button = FALSE;
     
-    if ( cooler_control_enabled ) {
-        __license_accepted = TRUE;
-    }
-
     /* Retrieve CtrlHandles from ctk_config */
 
     h = ctk_config->pCtrlHandles;
@@ -1503,11 +1463,6 @@ sensor_end:
     }
     
     if ( ctk_thermal->cooler_count && ctk_thermal->show_fan_control_frame ) {
-        /* Create the enable dialog */
-
-        ctk_thermal->enable_dialog = ctk_license_dialog_new(GTK_WIDGET(ctk_thermal),
-                                                            "Thermal Settings");
-
         /* Create the Enable Cooler control checkbox widget */
 
         ctk_thermal->enable_checkbox =
diff --git a/src/gtk+-2.x/ctkthermal.h b/src/gtk+-2.x/ctkthermal.h
index ff11785..920677c 100644
--- a/src/gtk+-2.x/ctkthermal.h
+++ b/src/gtk+-2.x/ctkthermal.h
@@ -88,8 +88,6 @@ struct _CtkThermal
     GtkWidget *apply_button;
     GtkWidget *reset_button;
     GtkWidget *enable_checkbox;
-    GtkWidget *enable_dialog;
-    GtkWidget *license_window;
     GtkWidget *fan_control_frame;
     GtkWidget *adaptive_clock_status;
     GtkWidget *fan_target;
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 5b4f9bc..dea0f65 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.19
+NVIDIA_VERSION = 337.25
diff --git a/src/parse.c b/src/parse.c
index fa189eb..3163eed 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -143,8 +143,8 @@ const AttributeTableEntry attributeTable[] = {
     { "GPUMemoryInterface",               NV_CTRL_GPU_MEMORY_BUS_WIDTH,                 INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Returns bus bandwidth of the GPU's memory interface." },
     { "GPUCoreTemp",                      NV_CTRL_GPU_CORE_TEMPERATURE,                 INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Reports the current core temperature in Celsius of the GPU driving the X screen." },
     { "GPUAmbientTemp",                   NV_CTRL_AMBIENT_TEMPERATURE,                  INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "Reports the current temperature in Celsius of the immediate neighborhood of the GPU driving the X screen." },
-    { "GPUGraphicsClockOffset",           NV_CTRL_GPU_NVCLOCK_OFFSET,                   INT_ATTR, {0,0,0,1,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Graphics Clock.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUGraphicsClockOffset[2]'." },
-    { "GPUMemoryTransferRateOffset",      NV_CTRL_GPU_MEM_TRANSFER_RATE_OFFSET,         INT_ATTR, {0,0,0,1,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Memory Transfer Rate.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUMemoryTransferRateOffset[2]'." },
+    { "GPUGraphicsClockOffset",           NV_CTRL_GPU_NVCLOCK_OFFSET,                   INT_ATTR, {0,0,0,1,1,1}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Graphics Clock.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUGraphicsClockOffset[2]'." },
+    { "GPUMemoryTransferRateOffset",      NV_CTRL_GPU_MEM_TRANSFER_RATE_OFFSET,         INT_ATTR, {0,0,0,1,1,1}, { .int_flags = {0,0,0,0,0,0,0} }, "This is the offset amount, in MHz, to over- or under-clock the Memory Transfer Rate.  Specify the performance level in square brackets after the attribute name.  E.g., 'GPUMemoryTransferRateOffset[2]'." },
     { "GPUOverclockingState",             NV_CTRL_GPU_OVERCLOCKING_STATE,               INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,0,0,0,0,0} }, "The current overclocking state; the value of this attribute controls the availability of additional overclocking attributes.  Note that this attribute is unavailable unless overclocking support has been enabled by the system administrator." },
     { "GPU2DClockFreqs",                  NV_CTRL_GPU_2D_CLOCK_FREQS,                   INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,1,0,0,0,0} }, "The GPU and memory clock frequencies when operating in 2D mode.  New clock frequencies are tested before being applied, and may be rejected.  Note that if the target clocks are too aggressive, their testing may render the system unresponsive.  Also note that while this attribute may always be queried, it cannot be set unless GPUOverclockingState is set to MANUAL.  Since the target clocks may be rejected, the requester should read this attribute after the set to determine success or failure." },
     { "GPU3DClockFreqs",                  NV_CTRL_GPU_3D_CLOCK_FREQS,                   INT_ATTR, {0,0,0,0,1,0}, { .int_flags = {0,0,1,0,0,0,0} }, "The GPU and memory clock frequencies  when operating in 3D mode.  New clock frequencies are tested before being applied, and may be rejected.  Note that if the target clocks are too aggressive, their testing may render the system unresponsive.  Also note that while this attribute may always be queried, it cannot be set unless GPUOverclockingState is set to MANUAL.  Since the target clocks may be rejected, the requester should read this attribute after the set to determine success or failure." },
diff --git a/src/src.mk b/src/src.mk
index bd1616b..ccf5a54 100644
--- a/src/src.mk
+++ b/src/src.mk
@@ -208,7 +208,6 @@ GTK_SRC += gtk+-2.x/ctkdisplayconfig-utils.c
 GTK_SRC += gtk+-2.x/ctkgvo-banner.c
 GTK_SRC += gtk+-2.x/ctkgvo-sync.c
 GTK_SRC += gtk+-2.x/ctkgvi.c
-GTK_SRC += gtk+-2.x/ctklicense.c
 GTK_SRC += gtk+-2.x/ctkecc.c
 GTK_SRC += gtk+-2.x/ctkappprofile.c
 GTK_SRC += gtk+-2.x/ctkapcprofilemodel.c
@@ -258,7 +257,6 @@ GTK_EXTRA_DIST += gtk+-2.x/ctkdisplayconfig-utils.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkgvo-banner.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkgvo-sync.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkgvi.h
-GTK_EXTRA_DIST += gtk+-2.x/ctklicense.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkecc.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkappprofile.h
 GTK_EXTRA_DIST += gtk+-2.x/ctkapcprofilemodel.h
diff --git a/src/version.mk b/src/version.mk
index 5b4f9bc..dea0f65 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.19
+NVIDIA_VERSION = 337.25
diff --git a/version.mk b/version.mk
index 5b4f9bc..dea0f65 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 337.19
+NVIDIA_VERSION = 337.25