352.21352.21

8 files changed, 32 insertions, 22 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 61aeb50..01fed6d 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 352.09
+NVIDIA_VERSION = 352.21
diff --git a/samples/version.mk b/samples/version.mk
index 61aeb50..01fed6d 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 352.09
+NVIDIA_VERSION = 352.21
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index 8a1bb7c..43ba968 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -1193,7 +1193,6 @@ GtkWidget* ctk_display_config_new(CtrlTarget *ctrl_target,
 
     gchar *err_str = NULL;
     gchar *layout_str = NULL;
-    gchar *sli_mode = NULL;
     ReturnStatus ret;
 
     const char *stereo_mode_str;
@@ -1201,21 +1200,6 @@ GtkWidget* ctk_display_config_new(CtrlTarget *ctrl_target,
     int stereo_mode, stereo_mode_max = NV_CTRL_STEREO_MAX;
 
     /*
-     * Get SLI Mode.  If SLI Mode is "Mosaic", do not
-     * load this page
-     *
-     */
-    ret = NvCtrlGetStringAttribute(ctrl_target,
-                                   NV_CTRL_STRING_SLI_MODE,
-                                   &sli_mode);
-    if (ret == NvCtrlSuccess && !g_ascii_strcasecmp(sli_mode, "Mosaic")) {
-        free(sli_mode);
-        return NULL;
-    }
-
-    free(sli_mode);
-
-    /*
      * Create the ctk object
      *
      */
@@ -5678,6 +5662,14 @@ static void do_enable_mosaic(CtkDisplayConfig *ctk_object)
                 display->screen != mosaic_screen) {
                 do_configure_display_on_xscreen(ctk_object, display,
                                                 mosaic_screen);
+
+                /*
+                 * The display has been added to the rightmost edge of the
+                 * mosaic screen with relative positioning. Update the layout
+                 * to set the absolute position, so the next iteration of this
+                 * loop can add the display to the new rightmost edge.
+                 */
+                ctk_display_layout_update(CTK_DISPLAY_LAYOUT(ctk_object->obj_layout));
             }
         }
     }
@@ -5710,6 +5702,15 @@ static void do_disable_mosaic(CtkDisplayConfig *ctk_object)
                     continue;
                 }
                 do_configure_display_on_new_xscreen(ctk_object, display);
+
+                /*
+                 * The new X screen has been set to the rightmost edge of
+                 * the rightmost X screen with relative positioning. Update
+                 * the layout to set the absolute position, so the next
+                 * iteration of this loop can add the display to the new
+                 * rightmost edge.
+                 */
+                ctk_display_layout_update(CTK_DISPLAY_LAYOUT(ctk_object->obj_layout));
             }
         }
     }
diff --git a/src/gtk+-2.x/ctkedid.c b/src/gtk+-2.x/ctkedid.c
index a957127..a681fcb 100644
--- a/src/gtk+-2.x/ctkedid.c
+++ b/src/gtk+-2.x/ctkedid.c
@@ -337,6 +337,15 @@ static void button_clicked(GtkButton *button, gpointer user_data)
                                    ctk_edid->file_format, data, len);
         }
 
+        /*
+         * Process pending GTK events here before destroying the filechooser
+         * to work around GTK dereferencing a NULL pointer during one of these
+         * events. See GNOME Bug 711321
+         */
+        while (gtk_events_pending()) {
+            gtk_main_iteration();
+        }
+
         gtk_widget_destroy(ctk_edid->file_selector);
 
         ctk_edid->file_selector = NULL;
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 61aeb50..01fed6d 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 352.09
+NVIDIA_VERSION = 352.21
diff --git a/src/version.h b/src/version.h
index 2a4f19c..e0fd124 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "352.09"
+#define NVIDIA_VERSION "352.21"
diff --git a/src/version.mk b/src/version.mk
index 61aeb50..01fed6d 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 352.09
+NVIDIA_VERSION = 352.21
diff --git a/version.mk b/version.mk
index 61aeb50..01fed6d 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 352.09
+NVIDIA_VERSION = 352.21