304.84304.84

12 files changed, 21 insertions, 27 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 98a4fa5..d454b96 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff --git a/samples/version.mk b/samples/version.mk
index 98a4fa5..d454b96 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff --git a/src/gtk+-2.x/ctkcolorcorrection.c b/src/gtk+-2.x/ctkcolorcorrection.c
index 1185c33..38639b2 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.c
+++ b/src/gtk+-2.x/ctkcolorcorrection.c
@@ -1008,18 +1008,19 @@ static gboolean do_confirm_countdown(gpointer data)
 } /* do_confirm_countdown() */
 
 
-GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table,
-                                                const gchar *title,
-                                                gboolean randr)
+GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table)
 {
     GtkTextIter i;
     GtkTextBuffer *b;
-
+    const gchar *title = "X Server Color Correction";
+    
     b = gtk_text_buffer_new(table);
     
     gtk_text_buffer_get_iter_at_offset(b, &i, 0);
     
-    ctk_color_correction_tab_help(b, &i, title, randr);
+    ctk_help_title(b, &i, "%s Help", title);
+
+    ctk_color_correction_tab_help(b, &i, title, FALSE /* randr */);
     
     ctk_help_heading(b, &i, "Reset Hardware Defaults");
     ctk_help_para(b, &i, __resest_button_help);
@@ -1034,12 +1035,12 @@ void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
                                    const gchar *title,
                                    gboolean randr)
 {
-    ctk_help_title(b, i, "%s Help", title);
+    ctk_help_heading(b, i, "Color Correction");
 
-    ctk_help_heading(b, i, "Active Color Channel");
+    ctk_help_term(b, i, "Active Color Channel");
     ctk_help_para(b, i, __active_color_help);
 
-    ctk_help_heading(b, i, "Brightness, Contrast and Gamma");
+    ctk_help_term(b, i, "Brightness, Contrast and Gamma");
     ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders "
                   "allow you to adjust the brightness, contrast, "
                   "or gamma values for the selected color channel(s).  This "
@@ -1066,6 +1067,6 @@ void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
                       "to manipulate the X screen's gamma ramps", title);
     }
 
-    ctk_help_heading(b, i, "Confirm Current Changes");
+    ctk_help_term(b, i, "Confirm Current Changes");
     ctk_help_para(b, i, __confirm_button_help);
 }
diff --git a/src/gtk+-2.x/ctkcolorcorrection.h b/src/gtk+-2.x/ctkcolorcorrection.h
index c9dfe48..cbeaa09 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.h
+++ b/src/gtk+-2.x/ctkcolorcorrection.h
@@ -79,9 +79,7 @@ GType       ctk_color_correction_get_type  (void) G_GNUC_CONST;
 GtkWidget*  ctk_color_correction_new       (NvCtrlAttributeHandle *,
                                             CtkConfig *, ParsedAttribute *,
                                             CtkEvent *);
-GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *,
-                                                const gchar *title,
-                                                gboolean randr);
+GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *);
 void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
                                    const gchar *title,
                                    gboolean randr);
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.c b/src/gtk+-2.x/ctkcolorcorrectionpage.c
index 3b15260..003ff03 100644
--- a/src/gtk+-2.x/ctkcolorcorrectionpage.c
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.c
@@ -123,8 +123,7 @@ GtkWidget* ctk_color_correction_page_new(NvCtrlAttributeHandle *handle,
 }
 
 
-GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table,
-                                                     const gchar *title)
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table)
 {
-    return ctk_color_correction_create_help(table, title, FALSE /* randr */);
+    return ctk_color_correction_create_help(table);
 }
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.h b/src/gtk+-2.x/ctkcolorcorrectionpage.h
index 5512985..5a9f5d9 100644
--- a/src/gtk+-2.x/ctkcolorcorrectionpage.h
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.h
@@ -79,8 +79,7 @@ GType       ctk_color_correction_page_get_type  (void) G_GNUC_CONST;
 GtkWidget*  ctk_color_correction_page_new       (NvCtrlAttributeHandle *,
                                                  CtkConfig *, ParsedAttribute *,
                                                  CtkEvent *);
-GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *,
-                                                     const gchar *title);
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *);
 
 G_END_DECLS
 
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index 0ffbee2..c5febea 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -897,7 +897,6 @@ static void add_color_correction_tab(CtkDisplayDevice *ctk_object,
     if (ctk_color_correction == NULL) {
         return;
     }
-    ctk_object->color_correction_tab = ctk_color_correction;
     ctk_object->color_correction_available = TRUE;
 
     box = gtk_hbox_new(FALSE, 0);
diff --git a/src/gtk+-2.x/ctkdisplaydevice.h b/src/gtk+-2.x/ctkdisplaydevice.h
index e1e27ff..c5fd37d 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.h
+++ b/src/gtk+-2.x/ctkdisplaydevice.h
@@ -71,7 +71,6 @@ struct _CtkDisplayDevice
     GtkWidget *edid;
     GtkWidget *dithering_controls;
     GtkWidget *color_controls;
-    GtkWidget *color_correction_tab;
 
     gboolean color_correction_available;
 
diff --git a/src/gtk+-2.x/ctkmultisample.c b/src/gtk+-2.x/ctkmultisample.c
index 7995df7..050240d 100644
--- a/src/gtk+-2.x/ctkmultisample.c
+++ b/src/gtk+-2.x/ctkmultisample.c
@@ -372,7 +372,7 @@ GtkWidget *ctk_multisample_new(NvCtrlAttributeHandle *handle,
 
             for (i = 0; i < ctk_multisample->fsaa_translation_table_size; i++)
                 ctk_multisample->active_attributes |=
-                    (1 << (__FSAA+ctk_multisample->fsaa_translation_table[i]));
+                    (__FSAA << ctk_multisample->fsaa_translation_table[i]);
 
             /* FXAA Option button */
 
diff --git a/src/gtk+-2.x/ctkwindow.c b/src/gtk+-2.x/ctkwindow.c
index 8437c5d..65cf4de 100644
--- a/src/gtk+-2.x/ctkwindow.c
+++ b/src/gtk+-2.x/ctkwindow.c
@@ -687,10 +687,9 @@ GtkWidget *ctk_window_new(ParsedAttribute *p, ConfigProperties *conf,
                                                   ctk_window->attribute_list,
                                                   ctk_event);
             if (child) {
-                const char *title = "X Server Color Correction";
-                help = ctk_color_correction_page_create_help(tag_table, title);
+                help = ctk_color_correction_page_create_help(tag_table);
                 add_page(child, help, ctk_window, &iter, NULL,
-                         title, NULL, NULL, NULL);
+                         "X Server Color Correction", NULL, NULL, NULL);
             }
         }
 
diff --git a/src/version.mk b/src/version.mk
index 98a4fa5..d454b96 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff --git a/version.mk b/version.mk
index 98a4fa5..d454b96 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84