nvidia-settings-wsecurity.patch

   1 --- nvidia-settings-319.32/src/command-line.c.old       2013-06-28 13:25:11.000000000 +0200
   2 +++ nvidia-settings-319.32/src/command-line.c   2013-06-28 13:28:33.000000000 +0200
   3 @@ -59,7 +59,7 @@
   4  static void print_version(void)
   5  {
   6      nv_msg(NULL, "");
   7 -    nv_msg(NULL, pNV_ID);
   8 +    nv_msg(NULL, pNV_ID, "%s");
   9      nv_msg(TAB, "The NVIDIA X Server Settings tool.");
  10      nv_msg(NULL, "");
  11      nv_msg(TAB, "This program is used to configure the "
  12 @@ -128,7 +128,7 @@
  13                  if (entry->flags & NV_PARSER_TYPE_VALUE_IS_SWITCH_DISPLAY)
  14                      nv_msg(NULL, "  - Attribute value is switch display.");
  15
  16 -                nv_msg(TAB, entry->desc);
  17 +                nv_msg(TAB, "%s", entry->desc);
  18                  nv_msg(NULL, "");
  19              } else {
  20                  nv_msg(NULL, "%s", entry->name);
  21 @@ -148,8 +148,8 @@
  22
  23  static void print_help_helper(const char *name, const char *description)
  24  {
  25 -    nv_msg(TAB, name);
  26 -    nv_msg_preserve_whitespace(BIGTAB, description);
  27 +    nv_msg(TAB, "%s", name);
  28 +    nv_msg_preserve_whitespace(BIGTAB, "%s", description, "%s");
  29      nv_msg(NULL, "");
  30  }
  31
  32 --- nvidia-settings-319.32/src/glxinfo.old      2013-06-28 13:30:39.000000000 +0200
  33 +++ nvidia-settings-319.32/src/glxinfo.c        2013-06-28 13:32:21.000000000 +0200
  34 @@ -415,21 +415,21 @@
  35          /* Print results */
  36          nv_msg(TAB, "direct rendering: %s", NULL_TO_EMPTY(direct_rendering));
  37          nv_msg(TAB, "GLX extensions:");
  38 -        nv_msg("    ", NULL_TO_EMPTY(glx_extensions));
  39 +        nv_msg("    ", NULL_TO_EMPTY(glx_extensions),"%s");
  40          nv_msg(" ", "\n");
  41          nv_msg(TAB, "server glx vendor string: %s",
  42                 NULL_TO_EMPTY(server_vendor));
  43          nv_msg(TAB, "server glx version string: %s",
  44                 NULL_TO_EMPTY(server_version));
  45          nv_msg(TAB, "server glx extensions:");
  46 -        nv_msg("    ", NULL_TO_EMPTY(server_extensions));
  47 +        nv_msg("    ", NULL_TO_EMPTY(server_extensions),"%s");
  48          nv_msg(" ", "\n");
  49          nv_msg(TAB, "client glx vendor string: %s",
  50                 NULL_TO_EMPTY(client_vendor));
  51          nv_msg(TAB, "client glx version string: %s",
  52                 NULL_TO_EMPTY(client_version));
  53          nv_msg(TAB, "client glx extensions:");
  54 -        nv_msg("    ", NULL_TO_EMPTY(client_extensions));
  55 +        nv_msg("    ", NULL_TO_EMPTY(client_extensions),"%s");
  56          nv_msg(" ", "\n");
  57          nv_msg(TAB, "OpenGL vendor string: %s",
  58                 NULL_TO_EMPTY(opengl_vendor));
  59 @@ -438,7 +438,7 @@
  60          nv_msg(TAB, "OpenGL version string: %s",
  61                 NULL_TO_EMPTY(opengl_version));
  62          nv_msg(TAB, "OpenGL extensions:");
  63 -        nv_msg("    ", NULL_TO_EMPTY(opengl_extensions));
  64 +        nv_msg("    ", NULL_TO_EMPTY(opengl_extensions),"%s");
  65  #ifdef GLX_VERSION_1_3
  66          if ( fbconfig_attribs != NULL ) {
  67              nv_msg(" ", "\n");
  68 --- nvidia-settings-319.32/src/gtk+-2.x/ctkxvideo.c.old 2013-06-28 13:33:56.000000000 +0200
  69 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkxvideo.c     2013-06-28 13:34:32.000000000 +0200
  70 @@ -532,7 +532,7 @@
  71
  72      if (ctk_xvideo->active_attributes & __XV_SYNC_TO_DISPLAY) {
  73          ctk_help_heading(b, &i, "Sync to this display device");
  74 -        ctk_help_para(b, &i, __xv_sync_to_display_help);
  75 +        ctk_help_para(b, &i, __xv_sync_to_display_help,"%s");
  76      }
  77
  78      ctk_help_finish(b);
  79 --- nvidia-settings-319.32/src/gtk+-2.x/ctkframelock.c.old      2013-06-28 13:35:43.000000000 +0200
  80 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkframelock.c  2013-06-29 09:58:03.000000000 +0200
  81 @@ -5963,8 +5963,8 @@
  82                    "device should behave in the frame lock group.  Setting  of "
  83                    "options is only available while frame lock is disabled.  "
  84                    "The following options are available:");
  85 -    ctk_help_para(b, &i, __server_checkbox_help);
  86 -    ctk_help_para(b, &i, __client_checkbox_help);
  87 +    ctk_help_para(b, &i, __server_checkbox_help,"%s");
  88 +    ctk_help_para(b, &i, __client_checkbox_help,"%s");
  89      ctk_help_para(b, &i, "Stereo LED: This indicates whether or not the "
  90                    "display device is synced to the stereo signal coming from "
  91                    "the Quadro Sync device.  This LED is only available to "
  92 @@ -5973,13 +5973,13 @@
  93                    "with the input timing signal.");
  94
  95      ctk_help_heading(b, &i, "Adding Devices");
  96 -    ctk_help_para(b, &i, __add_devices_button_help);
  97 +    ctk_help_para(b, &i, __add_devices_button_help,"%s");
  98      ctk_help_para(b, &i, "If the X Server is remote, be sure you have "
  99                    "configured remote access (via `xhost`, for example) "
 100                    "such that you are allowed to establish a connection.");
 101
 102      ctk_help_heading(b, &i, "Removing Devices");
 103 -    ctk_help_para(b, &i, __remove_devices_button_help);
 104 +    ctk_help_para(b, &i, __remove_devices_button_help,"%s");
 105
 106      /* House Sync Frame Help */
 107
 108 @@ -5991,17 +5991,17 @@
 109                    "device (See Display Device Information above.");
 110
 111      ctk_help_heading(b, &i, "Use House Sync on Server");
 112 -    ctk_help_para(b, &i, __use_house_sync_button_help);
 113 +    ctk_help_para(b, &i, __use_house_sync_button_help,"%s");
 114      ctk_help_para(b, &i, "If this option is checked and no house signal "
 115                    "is detected (House LED is red), the Quadro Sync device "
 116                    "will fall back to using internal timings from the primary "
 117                    "GPU.");
 118
 119      ctk_help_heading(b, &i, "Sync Interval");
 120 -    ctk_help_para(b, &i, __sync_interval_scale_help);
 121 +    ctk_help_para(b, &i, __sync_interval_scale_help,"%s");
 122
 123      ctk_help_heading(b, &i, "Sync Edge");
 124 -    ctk_help_para(b, &i, __sync_edge_combo_help);
 125 +    ctk_help_para(b, &i, __sync_edge_combo_help,"%s");
 126      ctk_help_para(b, &i, "Syncing to the rising (leading) edge should be "
 127                    "suitable for bi-level and TTL signals.  Syncing to the "
 128                    "falling edge should be used for tri-level signals.  "
 129 @@ -6010,10 +6010,10 @@
 130                    "only.");
 131
 132      ctk_help_heading(b, &i, "Video Mode");
 133 -    ctk_help_para(b, &i, __video_mode_help);
 134 +    ctk_help_para(b, &i, __video_mode_help,"%s");
 135
 136      ctk_help_heading(b, &i, "Video Mode Detect");
 137 -    ctk_help_para(b, &i, __detect_video_mode_button_help);
 138 +    ctk_help_para(b, &i, __detect_video_mode_button_help,"%s");
 139
 140      /* Button Help */
 141
 142 @@ -6026,7 +6026,7 @@
 143                    "be changed until you disable Test Link.");
 144
 145      ctk_help_heading(b, &i, "Enable Frame Lock");
 146 -    ctk_help_para(b, &i, __sync_enable_button_help);
 147 +    ctk_help_para(b, &i, __sync_enable_button_help,"%s");
 148      ctk_help_para(b, &i, "Only devices selected as clients or server will be "
 149                    "enabled.");
 150
 151 --- nvidia-settings-319.32/src/gtk+-2.x/ctkcolorcorrection.c.old        2013-06-29 10:08:48.000000000 +0200
 152 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkcolorcorrection.c    2013-06-29 18:40:28.000000000 +0200
 153 @@ -1053,7 +1053,7 @@
 154      ctk_color_correction_tab_help(b, &i, title, FALSE /* randr */);
 155
 156      ctk_help_heading(b, &i, "Reset Hardware Defaults");
 157 -    ctk_help_para(b, &i, __resest_button_help);
 158 +    ctk_help_para(b, &i, __resest_button_help,"%s");
 159
 160      ctk_help_finish(b);
 161
 162 @@ -1068,7 +1068,7 @@
 163      ctk_help_heading(b, i, "Color Correction");
 164
 165      ctk_help_term(b, i, "Active Color Channel");
 166 -    ctk_help_para(b, i, __active_color_help);
 167 +    ctk_help_para(b, i, __active_color_help,"%s");
 168
 169      ctk_help_term(b, i, "Brightness, Contrast and Gamma");
 170      ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders "
 171 @@ -1087,7 +1087,7 @@
 172                    "value equally across all channels will make these games "
 173                    "appear brighter, making them more playable.");
 174
 175 -    ctk_help_para(b, i, __color_curve_help);
 176 +    ctk_help_para(b, i, __color_curve_help,"%s");
 177
 178      if (randr) {
 179          ctk_help_para(b, i, "The %s tab uses the RandR extension to "
 180 @@ -1098,5 +1098,5 @@
 181      }
 182
 183      ctk_help_term(b, i, "Confirm Current Changes");
 184 -    ctk_help_para(b, i, __confirm_button_help);
 185 +    ctk_help_para(b, i, __confirm_button_help,"%s");
 186  }
 187 --- nvidia-settings-319.32/src/gtk+-2.x/ctkmultisample.c.old    2013-06-29 18:41:57.000000000 +0200
 188 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkmultisample.c        2013-06-29 18:44:37.000000000 +0200
 189 @@ -1524,7 +1524,7 @@
 190          ctk_help_term(b, &i, "Application Antialiasing Settings");
 191
 192          if (ctk_multisample->active_attributes & __FSAA_ENHANCE) {
 193 -            ctk_help_para(b, &i, __aa_menu_help);
 194 +            ctk_help_para(b, &i, __aa_menu_help,"%s");
 195              ctk_help_para(b, &i, "Use Application Settings will let applications "
 196                            "choose the AA mode.");
 197              ctk_help_para(b, &i, "Override Application Settings will override "
 198 @@ -1535,7 +1535,7 @@
 199                            "antialiasing mode use the mode selected by the "
 200                            "slider.");
 201          } else {
 202 -            ctk_help_para(b, &i, __aa_override_app_help);
 203 +            ctk_help_para(b, &i, __aa_override_app_help,"%s");
 204          }
 205
 206          if (ctk_multisample->active_attributes & __FSAA_NONE) {
 207 @@ -1647,7 +1647,7 @@
 208
 209      if (ctk_multisample->active_attributes & __FXAA) {
 210          ctk_help_term(b, &i, "Enable FXAA");
 211 -        ctk_help_para(b, &i, __fxaa_enable_help);
 212 +        ctk_help_para(b, &i, __fxaa_enable_help,"%s");
 213      }
 214
 215      if (ctk_multisample->active_attributes & __LOG_ANISO_RANGE) {
 216 @@ -1669,14 +1669,14 @@
 217
 218          ctk_help_term(b, &i, "Override Application Setting");
 219
 220 -        ctk_help_para(b, &i, __aniso_override_app_help);
 221 +        ctk_help_para(b, &i, __aniso_override_app_help,"%s");
 222
 223 -        ctk_help_para(b, &i, __aniso_slider_help);
 224 +        ctk_help_para(b, &i, __aniso_slider_help,"%s");
 225      }
 226
 227      if (ctk_multisample->active_attributes & __TEXTURE_SHARPEN) {
 228          ctk_help_heading(b, &i, "Texture Sharpening");
 229 -        ctk_help_para(b, &i, __texture_sharpening_help);
 230 +        ctk_help_para(b, &i, __texture_sharpening_help,"%s");
 231      }
 232
 233      ctk_help_finish(b);
 234 --- nvidia-settings-319.32/src/gtk+-2.x/ctkopengl.c.old 2013-06-29 18:45:28.000000000 +0200
 235 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkopengl.c     2013-06-29 18:46:39.000000000 +0200
 236 @@ -1206,7 +1206,7 @@
 237
 238      if (ctk_opengl->active_attributes & __SYNC_TO_VBLANK) {
 239          ctk_help_heading(b, &i, "Sync to VBlank");
 240 -        ctk_help_para(b, &i, __sync_to_vblank_help);
 241 +        ctk_help_para(b, &i, __sync_to_vblank_help,"%s");
 242      }
 243
 244      if (ctk_opengl->active_attributes & __ALLOW_FLIPPING) {
 245 @@ -1228,17 +1228,17 @@
 246
 247      if (ctk_opengl->active_attributes & __FORCE_STEREO) {
 248          ctk_help_heading(b, &i, "Force Stereo Flipping");
 249 -        ctk_help_para(b, &i, __force_stereo_help);
 250 +        ctk_help_para(b, &i, __force_stereo_help,"%s");
 251      }
 252
 253      if (ctk_opengl->active_attributes & __XINERAMA_STEREO) {
 254          ctk_help_heading(b, &i, "Allow Xinerama Stereo Flipping");
 255 -        ctk_help_para(b, &i, __xinerama_stereo_help);
 256 +        ctk_help_para(b, &i, __xinerama_stereo_help,"%s");
 257      }
 258
 259      if (ctk_opengl->active_attributes & __STEREO_EYES_EXCHANGE) {
 260          ctk_help_heading(b, &i, "Exchange Stereo Eyes");
 261 -        ctk_help_para(b, &i, __stereo_eyes_exchange_help);
 262 +        ctk_help_para(b, &i, __stereo_eyes_exchange_help,"%s");
 263      }
 264
 265      if (ctk_opengl->active_attributes & __IMAGE_SETTINGS) {
 266 @@ -1277,18 +1277,18 @@
 267      if (ctk_opengl->active_attributes & __AA_LINE_GAMMA) {
 268          ctk_help_heading(b, &i, "Enable gamma correction for "
 269                           "antialiased lines");
 270 -        ctk_help_para(b, &i, __aa_line_gamma_checkbox_help );
 271 +        ctk_help_para(b, &i, __aa_line_gamma_checkbox_help,"%s" );
 272      }
 273
 274      if (ctk_opengl->active_attributes & __AA_LINE_GAMMA_VALUE) {
 275          ctk_help_heading(b, &i, "Set gamma correction for "
 276                           "antialiased lines");
 277 -        ctk_help_para(b, &i, __aa_line_gamma_slider_help);
 278 +        ctk_help_para(b, &i, __aa_line_gamma_slider_help,"%s");
 279      }
 280
 281      if (ctk_opengl->active_attributes & __CONFORMANT_CLAMPING) {
 282          ctk_help_heading(b, &i, "Use Conformant Texture Clamping");
 283 -        ctk_help_para(b, &i, __use_conformant_clamping_help);
 284 +        ctk_help_para(b, &i, __use_conformant_clamping_help,"%s");
 285      }
 286
 287      if (ctk_opengl->active_attributes & __SHOW_SLI_VISUAL_INDICATOR) {
 288 --- nvidia-settings-319.32/src/gtk+-2.x/ctkglx.c.old    2013-06-29 18:47:53.000000000 +0200
 289 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkglx.c        2013-06-29 18:48:06.000000000 +0200
 290 @@ -945,7 +945,7 @@
 291                   );
 292
 293      ctk_help_heading(b, &i, "Show GLX Frame Buffer Configurations");
 294 -    ctk_help_para(b, &i, __show_fbc_help);
 295 +    ctk_help_para(b, &i, __show_fbc_help,"%s");
 296
 297      ctk_help_heading(b, &i, "GLX Frame Buffer Configurations");
 298      ctk_help_para(b, &i, "This table lists the supported frame buffer "
 299 --- nvidia-settings-319.32/src/gtk+-2.x/ctkhelp.c.old   2013-06-29 18:48:55.000000000 +0200
 300 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkhelp.c       2013-06-29 18:49:55.000000000 +0200
 301 @@ -414,7 +414,7 @@
 302                                        gchar *text)
 303  {
 304      ctk_help_heading(b, i, "Reset Hardware Defaults");
 305 -    ctk_help_para(b, i, text);
 306 +    ctk_help_para(b, i, text,"%s");
 307  }
 308
 309
 310 @@ -463,16 +463,16 @@
 311      for (cur = help_data_list; cur; cur = cur->next) {
 312          item = (CtkHelpDataItem *)cur->data;
 313          if (use_headings) {
 314 -            ctk_help_heading(b, i, item->label);
 315 +            ctk_help_heading(b, i, item->label,"%s");
 316          } else {
 317 -            ctk_help_term(b, i, item->label);
 318 +            ctk_help_term(b, i, item->label,"%s");
 319          }
 320          g_string_printf(temp_string, "%s", item->help_text);
 321          if (item->extended_help_text) {
 322              g_string_append_printf(temp_string, " %s",
 323                                     item->extended_help_text);
 324          }
 325 -        ctk_help_para(b, i, temp_string->str);
 326 +        ctk_help_para(b, i, temp_string->str,"%s");
 327      }
 328
 329      g_string_free(temp_string, TRUE);
 330 --- nvidia-settings-319.32/src/gtk+-2.x/ctkdisplaydevice.c.old  2013-06-29 18:51:41.000000000 +0200
 331 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkdisplaydevice.c      2013-06-29 18:52:18.000000000 +0200
 332 @@ -507,15 +507,15 @@
 333      ctk_help_title(b, &i, "%s Help", ctk_object->name);
 334
 335      ctk_help_heading(b, &i, "Device Information");
 336 -    ctk_help_para(b, &i, __info_help);
 337 +    ctk_help_para(b, &i, __info_help,"%s");
 338
 339      for (j = 0; j < ARRAY_LEN(__info_entry_data); j++) {
 340          InfoEntryData *entryData = __info_entry_data+j;
 341          InfoEntry *entry = ctk_object->info_entries+j;
 342
 343          if (entry->present) {
 344 -            ctk_help_term(b, &i, entryData->str);
 345 -            ctk_help_para(b, &i, *entryData->tooltip);
 346 +            ctk_help_term(b, &i, entryData->str,"%s");
 347 +            ctk_help_para(b, &i, *entryData->tooltip,"%s");
 348          }
 349      }
 350
 351 --- nvidia-settings-319.32/src/gtk+-2.x/ctkditheringcontrols.c.old      2013-06-29 18:52:53.000000000 +0200
 352 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkditheringcontrols.c  2013-06-29 18:53:36.000000000 +0200
 353 @@ -879,16 +879,16 @@
 354      }
 355
 356      ctk_help_heading(b, i, "Dithering Controls");
 357 -    ctk_help_para(b, i, __dithering_help);
 358 +    ctk_help_para(b, i, __dithering_help,"%s");
 359
 360      ctk_help_term(b, i, "Dithering");
 361 -    ctk_help_para(b, i, __dithering_config_help);
 362 +    ctk_help_para(b, i, __dithering_config_help,"%s");
 363
 364      ctk_help_term(b, i, "Mode");
 365 -    ctk_help_para(b, i, __dithering_mode_help);
 366 +    ctk_help_para(b, i, __dithering_mode_help,"%s");
 367
 368      ctk_help_term(b, i, "Depth");
 369 -    ctk_help_para(b, i, __dithering_depth_help);
 370 +    ctk_help_para(b, i, __dithering_depth_help,"%s");
 371  } /* add_dithering_controls_help() */
 372
 373
 374 --- nvidia-settings-319.32/src/gtk+-2.x/ctkthermal.c.old        2013-06-29 18:55:20.000000000 +0200
 375 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkthermal.c    2013-06-29 18:56:49.000000000 +0200
 376 @@ -1623,32 +1623,32 @@
 377
 378      if (!ctk_thermal->thermal_sensor_target_type_supported) {
 379          ctk_help_heading(b, &i, "Slowdown Threshold");
 380 -        ctk_help_para(b, &i, __core_threshold_help);
 381 +        ctk_help_para(b, &i, __core_threshold_help,"%s");
 382
 383          ctk_help_heading(b, &i, "Core Temperature");
 384 -        ctk_help_para(b, &i, __core_temp_help);
 385 +        ctk_help_para(b, &i, __core_temp_help,"%s");
 386
 387          if (ctk_thermal->ambient_label) {
 388              ctk_help_heading(b, &i, "Ambient Temperature");
 389 -            ctk_help_para(b, &i, __ambient_temp_help);
 390 +            ctk_help_para(b, &i, __ambient_temp_help,"%s");
 391          }
 392      } else {
 393          ctk_help_title(b, &i, "Thermal Sensor Information Help");
 394
 395          ctk_help_heading(b, &i, "ID");
 396 -        ctk_help_para(b, &i, __thermal_sensor_id_help);
 397 +        ctk_help_para(b, &i, __thermal_sensor_id_help,"%s");
 398
 399          ctk_help_heading(b, &i, "Temperature");
 400 -        ctk_help_para(b, &i, __thermal_sensor_reading_help);
 401 +        ctk_help_para(b, &i, __thermal_sensor_reading_help,"%s");
 402
 403          ctk_help_heading(b, &i, "Target");
 404 -        ctk_help_para(b, &i, __thermal_sensor_target_help);
 405 +        ctk_help_para(b, &i, __thermal_sensor_target_help,"%s");
 406
 407          ctk_help_heading(b, &i, "Provider");
 408 -        ctk_help_para(b, &i, __thermal_sensor_provider_help);
 409 +        ctk_help_para(b, &i, __thermal_sensor_provider_help,"%s");
 410      }
 411      ctk_help_heading(b, &i, "Level");
 412 -    ctk_help_para(b, &i, __temp_level_help);
 413 +    ctk_help_para(b, &i, __temp_level_help,"%s");
 414
 415  next_help:
 416      /* if Fan not available skip online help */
 417 @@ -1659,26 +1659,26 @@
 418      ctk_help_title(b, &i, "GPU Fan Settings Help");
 419
 420      ctk_help_heading(b, &i, "ID");
 421 -    ctk_help_para(b, &i, __fan_id_help);
 422 +    ctk_help_para(b, &i, __fan_id_help,"%s");
 423
 424      ctk_help_heading(b, &i, "Speed (%%)");
 425 -    ctk_help_para(b, &i, __fan_speed_help);
 426 +    ctk_help_para(b, &i, __fan_speed_help,"%s");
 427
 428      ctk_help_heading(b, &i, "Type");
 429 -    ctk_help_para(b, &i, __fan_control_type_help);
 430 +    ctk_help_para(b, &i, __fan_control_type_help,"%s");
 431
 432      ctk_help_heading(b, &i, "Cooling Target");
 433 -    ctk_help_para(b, &i, __fan_cooling_target_help);
 434 +    ctk_help_para(b, &i, __fan_cooling_target_help,"%s");
 435
 436      ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 437 -    ctk_help_para(b, &i, __enable_button_help);
 438 +    ctk_help_para(b, &i, __enable_button_help,"%s");
 439
 440      if ( ctk_thermal->show_fan_control_frame ) {
 441          ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 442 -        ctk_help_para(b, &i, __apply_button_help);
 443 +        ctk_help_para(b, &i, __apply_button_help,"%s");
 444
 445          ctk_help_heading(b, &i, "Enable GPU Fan Settings");
 446 -        ctk_help_para(b, &i, __reset_button_help);
 447 +        ctk_help_para(b, &i, __reset_button_help,"%s");
 448      }
 449  done:
 450      ctk_help_finish(b);
 451 --- nvidia-settings-319.32/src/gtk+-2.x/ctkpowermizer.c.old     2013-06-29 18:57:41.000000000 +0200
 452 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkpowermizer.c 2013-06-29 18:58:38.000000000 +0200
 453 @@ -1366,7 +1366,7 @@
 454                   conf_string);
 455      }
 456
 457 -    ctk_config_statusbar_message(ctk_powermizer->ctk_config, message);
 458 +    ctk_config_statusbar_message(ctk_powermizer->ctk_config, message,"%s");
 459  } /* post_dp_configuration_update() */
 460
 461
 462 @@ -1497,7 +1497,7 @@
 463
 464      if (ctk_powermizer->adaptive_clock_status) {
 465          ctk_help_heading(b, &i, "Adaptive Clocking");
 466 -        ctk_help_para(b, &i, __adaptive_clock_help);
 467 +        ctk_help_para(b, &i, __adaptive_clock_help,"%s");
 468      }
 469
 470      if (ctk_powermizer->gpu_clock && ctk_powermizer->memory_clock) {
 471 @@ -1514,31 +1514,31 @@
 472
 473      if (ctk_powermizer->power_source) {
 474          ctk_help_heading(b, &i, "Power Source");
 475 -        ctk_help_para(b, &i, __power_source_help);
 476 +        ctk_help_para(b, &i, __power_source_help,"%s");
 477      }
 478
 479      if (ctk_powermizer->pcie_gen_queriable) {
 480          ctk_help_heading(b, &i, "Current PCIe link width");
 481 -        ctk_help_para(b, &i, __current_pcie_link_width_help);
 482 +        ctk_help_para(b, &i, __current_pcie_link_width_help,"%s");
 483          ctk_help_heading(b, &i, "Current PCIe link speed");
 484 -        ctk_help_para(b, &i, __current_pcie_link_speed_help);
 485 +        ctk_help_para(b, &i, __current_pcie_link_speed_help,"%s");
 486      }
 487
 488      if (ctk_powermizer->performance_level) {
 489          ctk_help_heading(b, &i, "Performance Level");
 490          ctk_help_para(b, &i, __performance_level_help);
 491          ctk_help_heading(b, &i, "Performance Levels (Table)");
 492 -        ctk_help_para(b, &i, __performance_levels_table_help);
 493 +        ctk_help_para(b, &i, __performance_levels_table_help,"%s");
 494      }
 495
 496      if (ctk_powermizer->powermizer_menu) {
 497          ctk_help_heading(b, &i, "PowerMizer Settings");
 498 -        ctk_help_para(b, &i, ctk_powermizer->powermizer_menu_help);
 499 +        ctk_help_para(b, &i, ctk_powermizer->powermizer_menu_help,"%s");
 500      }
 501
 502      if (ctk_powermizer->configuration_button) {
 503          ctk_help_heading(b, &i, "CUDA - Double precision");
 504 -        ctk_help_para(b, &i, __dp_configuration_button_help);
 505 +        ctk_help_para(b, &i, __dp_configuration_button_help,"%s");
 506      }
 507
 508      ctk_help_finish(b);
 509 --- nvidia-settings-319.32/src/gtk+-2.x/ctkpowermizer.c.old     2013-06-29 18:59:39.000000000 +0200
 510 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkpowermizer.c 2013-06-29 19:00:16.000000000 +0200
 511 @@ -1509,7 +1509,7 @@
 512              s = "This indicates the GPU's current Graphics Clock and "
 513                  "Memory Clock frequencies.";
 514          }
 515 -        ctk_help_para(b, &i, s);
 516 +        ctk_help_para(b, &i, s,"%s");
 517      }
 518
 519      if (ctk_powermizer->power_source) {
 520 @@ -1526,7 +1526,7 @@
 521
 522      if (ctk_powermizer->performance_level) {
 523          ctk_help_heading(b, &i, "Performance Level");
 524 -        ctk_help_para(b, &i, __performance_level_help);
 525 +        ctk_help_para(b, &i, __performance_level_help,"%s");
 526          ctk_help_heading(b, &i, "Performance Levels (Table)");
 527          ctk_help_para(b, &i, __performance_levels_table_help,"%s");
 528      }
 529 --- nvidia-settings-319.32/src/gtk+-2.x/ctkgvo.c.old    2013-06-29 19:01:26.000000000 +0200
 530 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkgvo.c        2013-06-29 19:04:32.000000000 +0200
 531 @@ -783,16 +783,16 @@
 532      ctk_help_para(b, &i, "This section shows information about the SDI device "
 533                    "that is associated with the X screen.");
 534      ctk_help_heading(b, &i, "Firmware Version");
 535 -    ctk_help_para(b, &i, __general_firmware_version_help);
 536 +    ctk_help_para(b, &i, __general_firmware_version_help,"%s");
 537      ctk_help_heading(b, &i, "Current SDI Resolution");
 538 -    ctk_help_para(b, &i, __general_current_sdi_resolution_help);
 539 +    ctk_help_para(b, &i, __general_current_sdi_resolution_help,"%s");
 540      ctk_help_heading(b, &i, "Current SDI State");
 541 -    ctk_help_para(b, &i, __general_current_sdi_state_help);
 542 +    ctk_help_para(b, &i, __general_current_sdi_state_help,"%s");
 543
 544      ctk_help_heading(b, &i, "Requested SDI Video Format");
 545 -    ctk_help_para(b, &i, __requested_sdi_video_format_help);
 546 +    ctk_help_para(b, &i, __requested_sdi_video_format_help,"%s");
 547      ctk_help_heading(b, &i, "Requested SDI Data Format");
 548 -    ctk_help_para(b, &i, __requested_sdi_data_format_help);
 549 +    ctk_help_para(b, &i, __requested_sdi_data_format_help,"%s");
 550
 551      ctk_help_finish(b);
 552
 553 --- nvidia-settings-319.32/src/gtk+-2.x/ctkgvo-csc.c.old        2013-06-29 19:05:49.000000000 +0200
 554 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkgvo-csc.c    2013-06-29 19:07:07.000000000 +0200
 555 @@ -1245,10 +1245,10 @@
 556                    "the SDI (GVO) color space conversion.");
 557
 558      ctk_help_heading(b, &i, "Override default Color Space Conversion");
 559 -    ctk_help_para(b, &i, __override_help);
 560 +    ctk_help_para(b, &i, __override_help,"%s");
 561
 562      ctk_help_heading(b, &i, "Initialize Color Space Conversion");
 563 -    ctk_help_para(b, &i, __initialize_help);
 564 +    ctk_help_para(b, &i, __initialize_help,"%s");
 565
 566      ctk_help_heading(b, &i, "Color Space Conversion Matrix, Offset and Scale");
 567      ctk_help_para(b, &i, "%s  RGB color is converted to YCrCb in the "
 568 @@ -1282,11 +1282,11 @@
 569
 570      if (ctk_gvo_csc->caps & NV_CTRL_GVO_CAPABILITIES_APPLY_CSC_IMMEDIATELY) {
 571          ctk_help_heading(b, &i, "Apply Changes Immediately");
 572 -        ctk_help_para(b, &i, __apply_immediately_help);
 573 +        ctk_help_para(b, &i, __apply_immediately_help,"%s");
 574      }
 575
 576      ctk_help_heading(b, &i, "Apply");
 577 -    ctk_help_para(b, &i, __apply_help);
 578 +    ctk_help_para(b, &i, __apply_help,"%s");
 579
 580      ctk_help_finish(b);
 581
 582 --- nvidia-settings-319.32/src/gtk+-2.x/ctkclocks.c.old 2013-06-29 19:18:42.000000000 +0200
 583 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkclocks.c     2013-06-29 19:20:11.000000000 +0200
 584 @@ -599,7 +599,7 @@
 585                    "void manufacturer warranties.  DO THIS AT YOUR OWN RISK."
 586                    );
 587      ctk_help_heading(b, &i, "Enabling Clock Frequencies");
 588 -    ctk_help_para(b, &i, __enable_button_help);
 589 +    ctk_help_para(b, &i, __enable_button_help,"%s");
 590      ctk_help_para(b, &i,
 591                    "GPU Overclocking functionality is currently limited to "
 592                    "GeForce FX and newer non-mobile GPUs."
 593 @@ -614,21 +614,21 @@
 594                    "frequencies used when running 3D applications."
 595                    );
 596      ctk_help_heading(b, &i, "Graphics Clock Frequency");
 597 -    ctk_help_para(b, &i, __graphics_clock_help);
 598 +    ctk_help_para(b, &i, __graphics_clock_help,"%s");
 599      ctk_help_heading(b, &i, "Memory Clock Frequency");
 600 -    ctk_help_para(b, &i, __mem_clock_help);
 601 +    ctk_help_para(b, &i, __mem_clock_help,"%s");
 602      ctk_help_heading(b, &i, "Applying Custom Clock Frequencies");
 603 -    ctk_help_para(b, &i, __apply_button_help);
 604 +    ctk_help_para(b, &i, __apply_button_help,"%s");
 605      ctk_help_heading(b, &i, "Auto Detect Optimal 3D Clock Frequencies");
 606 -    ctk_help_para(b, &i, __detect_button_help);
 607 +    ctk_help_para(b, &i, __detect_button_help,"%s");
 608      ctk_help_heading(b, &i, "Canceling Optimal 3D Clock Frequency Auto-"
 609                       "detection.");
 610 -    ctk_help_para(b, &i, __cancel_button_help);
 611 +    ctk_help_para(b, &i, __cancel_button_help,"%s");
 612      ctk_help_para(b, &i,
 613                    "This button is only available if the Optimal "
 614                    "clocks are currently being probed.");
 615      ctk_help_heading(b, &i, "Restoring Hardware Default Frequencies");
 616 -    ctk_help_para(b, &i, __reset_button_help);
 617 +    ctk_help_para(b, &i, __reset_button_help,"%s");
 618
 619      ctk_help_finish(b);
 620
 621 @@ -887,10 +887,10 @@
 622
 623      if ( ctk_object->probing_optimal ) {
 624          ctk_config_statusbar_message(ctk_object->ctk_config,
 625 -                                     __detect_wait_msg);
 626 +                                     __detect_wait_msg,"%s");
 627      } else {
 628          ctk_config_statusbar_message(ctk_object->ctk_config,
 629 -                                     __canceled_msg);
 630 +                                     __canceled_msg,"%s");
 631      }
 632
 633  } /* auto_detection_state_received() */
 634 @@ -1380,6 +1380,6 @@
 635      if ( ret == NvCtrlSuccess &&
 636           value == NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_STATE_BUSY ) {
 637          ctk_config_statusbar_message(ctk_object->ctk_config,
 638 -                                     __detect_wait_msg);
 639 +                                     __detect_wait_msg,"%s");
 640      }
 641  }
 642 --- nvidia-settings-319.32/src/gtk+-2.x/ctkutils.c.old  2013-06-29 19:20:51.000000000 +0200
 643 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkutils.c      2013-06-29 19:21:19.000000000 +0200
 644 @@ -300,7 +300,7 @@
 645      GtkWidget *dlg;
 646
 647      if (msg) {
 648 -        nv_error_msg(msg);
 649 +        nv_error_msg(msg,"%s");
 650
 651          if (parent) {
 652              dlg = gtk_message_dialog_new
 653 @@ -328,7 +328,7 @@
 654      GtkWidget *dlg;
 655
 656      if (msg) {
 657 -        nv_warning_msg(msg);
 658 +        nv_warning_msg(msg,"%s");
 659
 660          if (parent) {
 661              dlg = gtk_message_dialog_new
 662 --- nvidia-settings-319.32/src/gtk+-2.x/ctkedid.c.old   2013-06-29 20:11:00.000000000 +0200
 663 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkedid.c       2013-06-29 20:11:17.000000000 +0200
 664 @@ -421,6 +421,6 @@
 665  void add_acquire_edid_help(GtkTextBuffer *b, GtkTextIter *i)
 666  {
 667      ctk_help_heading(b, i, "Acquire EDID");
 668 -    ctk_help_para(b, i, __acquire_edid_help);
 669 +    ctk_help_para(b, i, __acquire_edid_help,"%s");
 670
 671  } /* add_acquire_edid_help() */
 672 --- nvidia-settings-319.32/src/gtk+-2.x/ctkdisplayconfig.c.old  2013-06-29 20:13:12.000000000 +0200
 673 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkdisplayconfig.c      2013-06-29 20:24:02.000000000 +0200
 674 @@ -717,7 +717,7 @@
 675
 676              parent = ctk_get_parent_window(GTK_WIDGET(ctk_object));
 677              if (!parent) {
 678 -                nv_warning_msg(msg);
 679 +                nv_warning_msg(msg,"%s");
 680                  g_free(msg);
 681                  break;
 682              }
 683 @@ -2209,12 +2209,12 @@
 684                    "down the CONTROL key while clicking on the display, and can "
 685                    "be moved by holding CONTROL-Click and dragging.");
 686      ctk_help_heading(b, &i, "Layout Hidden Label");
 687 -    ctk_help_para(b, &i, __layout_hidden_label_help);
 688 +    ctk_help_para(b, &i, __layout_hidden_label_help,"%s");
 689      ctk_help_heading(b, &i, "Enable Xinerama");
 690      ctk_help_para(b, &i, "%s  This setting is only available when multiple "
 691                    "X screens are present.", __layout_xinerama_button_help);
 692      ctk_help_heading(b, &i, "Selection");
 693 -    ctk_help_para(b, &i, __selected_item_help);
 694 +    ctk_help_para(b, &i, __selected_item_help,"%s");
 695
 696      ctk_help_para(b, &i, "");
 697      ctk_help_heading(b, &i, "Display Options");
 698 @@ -2222,7 +2222,7 @@
 699                    "device is selected in the Selection drop-down to configure "
 700                    "the settings for that display device.");
 701      ctk_help_heading(b, &i, "Resolution");
 702 -    ctk_help_para(b, &i, __dpy_resolution_mnu_help);
 703 +    ctk_help_para(b, &i, __dpy_resolution_mnu_help,"%s");
 704      ctk_help_heading(b, &i, "Refresh");
 705      ctk_help_para(b, &i, "The Refresh drop-down is to the right of the "
 706                    "Resolution drop-down.  %s", __dpy_refresh_mnu_help);
 707 @@ -2231,7 +2231,7 @@
 708                    "currently chosen for the selected display device.  "
 709                    "This is only available when advanced view is enabled.");
 710      ctk_help_heading(b, &i, "Stereo Eye");
 711 -    ctk_help_para(b, &i, __dpy_stereo_help);
 712 +    ctk_help_para(b, &i, __dpy_stereo_help,"%s");
 713      ctk_help_heading(b, &i, "Orientation");
 714      ctk_help_para(b, &i, "The Orientation drop-downs control how the desktop "
 715                    "image is rotated and/or reflected.  %s  %s  Note that "
 716 @@ -2243,20 +2243,20 @@
 717                    "size.  This feature is formerly known as Overscan "
 718                    "Compensation.", __dpy_underscan_text_help);
 719      ctk_help_heading(b, &i, "Position Type");
 720 -    ctk_help_para(b, &i, __dpy_position_type_help);
 721 +    ctk_help_para(b, &i, __dpy_position_type_help,"%s");
 722      ctk_help_heading(b, &i, "Position Relative");
 723 -    ctk_help_para(b, &i, __dpy_position_relative_help);
 724 +    ctk_help_para(b, &i, __dpy_position_relative_help,"%s");
 725      ctk_help_heading(b, &i, "Position Offset");
 726 -    ctk_help_para(b, &i, __dpy_position_offset_help);
 727 +    ctk_help_para(b, &i, __dpy_position_offset_help,"%s");
 728      ctk_help_heading(b, &i, "ViewPortIn");
 729 -    ctk_help_para(b, &i, __dpy_viewport_in_help);
 730 +    ctk_help_para(b, &i, __dpy_viewport_in_help,"%s");
 731      ctk_help_heading(b, &i, "ViewPortOut");
 732 -    ctk_help_para(b, &i, __dpy_viewport_out_help);
 733 +    ctk_help_para(b, &i, __dpy_viewport_out_help,"%s");
 734      ctk_help_heading(b, &i, "Panning");
 735      ctk_help_para(b, &i, "%s  This is only available when advanced "
 736                    "view is enabled.", __dpy_panning_help);
 737      ctk_help_heading(b, &i, "Primary Display");
 738 -    ctk_help_para(b, &i, __dpy_primary_help);
 739 +    ctk_help_para(b, &i, __dpy_primary_help,"%s");
 740
 741
 742      ctk_help_para(b, &i, "");
 743 @@ -2269,15 +2269,15 @@
 744                    "304x200, and the width must be a multiple of 8.",
 745                    __screen_virtual_size_help);
 746      ctk_help_heading(b, &i, "Color Depth");
 747 -    ctk_help_para(b, &i, __screen_depth_help);
 748 +    ctk_help_para(b, &i, __screen_depth_help,"%s");
 749      ctk_help_heading(b, &i, "Stereo Mode");
 750 -    ctk_help_para(b, &i, __screen_stereo_help);
 751 +    ctk_help_para(b, &i, __screen_stereo_help,"%s");
 752      ctk_help_heading(b, &i, "Position Type");
 753 -    ctk_help_para(b, &i, __screen_position_type_help);
 754 +    ctk_help_para(b, &i, __screen_position_type_help,"%s");
 755      ctk_help_heading(b, &i, "Position Relative");
 756 -    ctk_help_para(b, &i, __screen_position_relative_help);
 757 +    ctk_help_para(b, &i, __screen_position_relative_help,"%s");
 758      ctk_help_heading(b, &i, "Position Offset");
 759 -    ctk_help_para(b, &i, __screen_position_offset_help);
 760 +    ctk_help_para(b, &i, __screen_position_offset_help,"%s");
 761      ctk_help_heading(b, &i, "MetaMode Selection");
 762      ctk_help_para(b, &i, "%s  This is only available when advanced view "
 763                    "is enabled.", __screen_metamode_help);
 764 @@ -2300,16 +2300,16 @@
 765                    "screen, adding/removing an X screen, and changing the X "
 766                    "screen color depth.", __apply_button_help);
 767      ctk_help_heading(b, &i, "Detect Displays");
 768 -    ctk_help_para(b, &i, __detect_displays_button_help);
 769 +    ctk_help_para(b, &i, __detect_displays_button_help,"%s");
 770      ctk_help_heading(b, &i, "Advanced/Basic...");
 771      ctk_help_para(b, &i, "%s  The Basic view modifies the currently active "
 772                    "MetaMode for an X screen, while the advanced view exposes "
 773                    "all the MetaModes available on an X screen, and lets you "
 774                    "modify each of them.", __advanced_button_help);
 775      ctk_help_heading(b, &i, "Reset");
 776 -    ctk_help_para(b, &i, __reset_button_help);
 777 +    ctk_help_para(b, &i, __reset_button_help,"%s");
 778      ctk_help_heading(b, &i, "Save to X Configuration File");
 779 -    ctk_help_para(b, &i, __save_button_help);
 780 +    ctk_help_para(b, &i, __save_button_help,"%s");
 781
 782      ctk_help_finish(b);
 783
 784 @@ -5856,7 +5856,7 @@
 785                                    "", &tokens);
 786              update = TRUE;
 787              if (!display_add_modelines_from_server(display, display->gpu, &err_str)) {
 788 -                nv_warning_msg(err_str);
 789 +                nv_warning_msg(err_str,"%s");
 790                  g_free(err_str);
 791                  return;
 792              }
 793 @@ -8936,7 +8936,7 @@
 794      /* Handle errors loading the new layout */
 795      if (!layout || err_str) {
 796          if (err_str) {
 797 -            nv_error_msg(err_str);
 798 +            nv_error_msg(err_str,"%s");
 799              g_free(err_str);
 800          }
 801          return;
 802 --- nvidia-settings-319.32/src/gtk+-2.x/ctkdisplayconfig-utils.c.old    2013-06-29 20:26:09.000000000 +0200
 803 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkdisplayconfig-utils.c        2013-06-29 20:31:29.000000000 +0200
 804 @@ -1485,7 +1485,7 @@
 805                                    "device %d '%s'.",
 806                                     NvCtrlGetTargetId(display->handle),
 807                                     display->logName);
 808 -        nv_error_msg(*err_str);
 809 +        nv_error_msg(*err_str,"%s");
 810          goto fail;
 811      }
 812
 813 @@ -1503,7 +1503,7 @@
 814                                         NvCtrlGetTargetId(display->handle),
 815                                         display->logName,
 816                                         str);
 817 -            nv_error_msg(*err_str);
 818 +            nv_error_msg(*err_str,"%s");
 819              goto fail;
 820          }
 821
 822 @@ -2304,7 +2304,7 @@
 823                                     "screen %d (on GPU-%d).",
 824                                     screen->scrnum,
 825                                     NvCtrlGetTargetId(screen->gpu->handle));
 826 -        nv_error_msg(*err_str);
 827 +        nv_error_msg(*err_str,"%s");
 828          goto fail;
 829      }
 830
 831 @@ -2318,7 +2318,7 @@
 832                                     "screen %d (on GPU-%d).",
 833                                     screen->scrnum,
 834                                     NvCtrlGetTargetId(screen->gpu->handle));
 835 -        nv_error_msg(*err_str);
 836 +        nv_error_msg(*err_str,"%s");
 837          goto fail;
 838      }
 839
 840 @@ -2612,7 +2612,7 @@
 841                                     "device DPY-%d.",
 842                                     displayNameInfo->nameDescription,
 843                                     NvCtrlGetTargetId(display->handle));
 844 -        nv_error_msg(*err_str);
 845 +        nv_error_msg(*err_str,"%s");
 846          return FALSE;
 847      }
 848
 849 @@ -2651,7 +2651,7 @@
 850                                     "display %d (on GPU-%d).",
 851                                     display_id,
 852                                     NvCtrlGetTargetId(gpu->handle));
 853 -        nv_error_msg(*err_str);
 854 +        nv_error_msg(*err_str,"%s");
 855          goto fail;
 856      }
 857
 858 @@ -2808,7 +2808,7 @@
 859          *err_str = g_strdup_printf("Failed to query list of displays \n"
 860                                     "connected to GPU-%d '%s'.",
 861                                     NvCtrlGetTargetId(gpu->handle), gpu->name);
 862 -        nv_error_msg(*err_str);
 863 +        nv_error_msg(*err_str,"%s");
 864          goto fail;
 865      }
 866
 867 @@ -3064,7 +3064,7 @@
 868      if (!gpu->handle) {
 869          *err_str = g_strdup_printf("Failed to create NV-CONTROL handle for "
 870                                     "GPU-%d.", gpu_id);
 871 -        nv_error_msg(*err_str);
 872 +        nv_error_msg(*err_str,"%s");
 873          goto fail;
 874      }
 875
 876 @@ -3077,7 +3077,7 @@
 877      if (ret != NvCtrlSuccess) {
 878          *err_str = g_strdup_printf("Failed to query GPU name of GPU-%d.",
 879                                     gpu_id);
 880 -        nv_error_msg(*err_str);
 881 +        nv_error_msg(*err_str,"%s");
 882          goto fail;
 883      }
 884
 885 @@ -3088,7 +3088,7 @@
 886      if (ret != NvCtrlSuccess) {
 887          *err_str = g_strdup_printf("Failed to query MAX SCREEN WIDTH on "
 888                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 889 -        nv_error_msg(*err_str);
 890 +        nv_error_msg(*err_str,"%s");
 891          goto fail;
 892      }
 893
 894 @@ -3097,7 +3097,7 @@
 895      if (ret != NvCtrlSuccess) {
 896          *err_str = g_strdup_printf("Failed to query MAX SCREEN HEIGHT on "
 897                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 898 -        nv_error_msg(*err_str);
 899 +        nv_error_msg(*err_str,"%s");
 900          goto fail;
 901      }
 902
 903 @@ -3106,7 +3106,7 @@
 904      if (ret != NvCtrlSuccess) {
 905          *err_str = g_strdup_printf("Failed to query MAX DISPLAYS on "
 906                                     "GPU-%d '%s'.", gpu_id, gpu->name);
 907 -        nv_error_msg(*err_str);
 908 +        nv_error_msg(*err_str,"%s");
 909          goto fail;
 910      }
 911
 912 @@ -3176,7 +3176,7 @@
 913      if (ret != NvCtrlSuccess || !ngpus) {
 914          *err_str = g_strdup("Failed to query number of GPUs (or no GPUs "
 915                              "found) in the system.");
 916 -        nv_error_msg(*err_str);
 917 +        nv_error_msg(*err_str,"%s");
 918          goto fail;
 919      }
 920
 921 @@ -3307,7 +3307,7 @@
 922          *err_str = g_strdup_printf("Failed to create NV-CONTROL handle for\n"
 923                                     "screen %d.",
 924                                     screen_id);
 925 -        nv_error_msg(*err_str);
 926 +        nv_error_msg(*err_str,"%s");
 927          goto fail;
 928      }
 929
 930 @@ -3342,7 +3342,7 @@
 931          *err_str = g_strdup_printf("Failed to query Dynamic TwinView for "
 932                                     "screen %d.",
 933                                     screen_id);
 934 -        nv_warning_msg(*err_str);
 935 +        nv_warning_msg(*err_str,"%s");
 936          goto fail;
 937      }
 938      screen->dynamic_twinview = !!val;
 939 @@ -3354,7 +3354,7 @@
 940          *err_str = g_strdup_printf("Failed to query NoScanout for "
 941                                     "screen %d.",
 942                                     screen_id);
 943 -        nv_warning_msg(*err_str);
 944 +        nv_warning_msg(*err_str,"%s");
 945          goto fail;
 946      }
 947      screen->no_scanout = (val == NV_CTRL_NO_SCANOUT_ENABLED);
 948 @@ -3368,7 +3368,7 @@
 949                                     "support scanout screens (%d) that have "
 950                                     "dynamic twinview disabled.",
 951                                     screen_id);
 952 -        nv_warning_msg(*err_str);
 953 +        nv_warning_msg(*err_str,"%s");
 954          goto fail;
 955      }
 956
 957 @@ -3376,7 +3376,7 @@
 958      if (!link_screen_to_gpu(layout, screen)) {
 959          *err_str = g_strdup_printf("Failed to find GPU that drives screen %d.",
 960                                     screen_id);
 961 -        nv_warning_msg(*err_str);
 962 +        nv_warning_msg(*err_str,"%s");
 963          goto fail;
 964      }
 965
 966 @@ -3475,7 +3475,7 @@
 967      if (ret != NvCtrlSuccess || !nscreens) {
 968          *err_str = g_strdup("Failed to query number of X screens (or no X "
 969                              "screens found) in the system.");
 970 -        nv_error_msg(*err_str);
 971 +        nv_error_msg(*err_str,"%s");
 972          nscreens = 0;
 973          goto fail;
 974      }
 975 @@ -3567,7 +3567,7 @@
 976                               &layout->xinerama_enabled);
 977      if (ret != NvCtrlSuccess) {
 978          *err_str = g_strdup("Failed to query status of Xinerama.");
 979 -        nv_error_msg(*err_str);
 980 +        nv_error_msg(*err_str,"%s");
 981          goto fail;
 982      }
 983
 984 @@ -3580,7 +3580,7 @@
 985                                     "Display Configuration page.",
 986                                     displayName ? displayName : "this X server");
 987          free(displayName);
 988 -        nv_warning_msg(*err_str);
 989 +        nv_warning_msg(*err_str,"%s");
 990          goto fail;
 991      }
 992
 993 --- nvidia-settings-319.32/src/gtk+-2.x/ctkgvo-sync.c.old       2013-06-29 20:33:02.000000000 +0200
 994 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkgvo-sync.c   2013-06-29 20:33:59.000000000 +0200
 995 @@ -1502,30 +1502,30 @@
 996                    "SDI synchronization options.");
 997
 998      ctk_help_heading(b, &i, "Input Video Format");
 999 -    ctk_help_para(b, &i, __input_video_format_help);
1000 +    ctk_help_para(b, &i, __input_video_format_help,"%s");
1001      ctk_help_heading(b, &i, "Input Video Format Detect");
1002 -    ctk_help_para(b, &i, __input_video_format_detect_help);
1003 +    ctk_help_para(b, &i, __input_video_format_detect_help,"%s");
1004      ctk_help_heading(b, &i, "Composite Termination");
1005      ctk_help_para(b, &i, "%s.  This allows the composite signal to be daisy "
1006                    "chained from a server load.",
1007                    __composite_termination_help);
1008      ctk_help_heading(b, &i, "Sync Mode");
1009 -    ctk_help_para(b, &i, __sync_mode_help);
1010 +    ctk_help_para(b, &i, __sync_mode_help,"%s");
1011      ctk_help_heading(b, &i, "Sync Format");
1012 -    ctk_help_para(b, &i, __sync_format_help);
1013 +    ctk_help_para(b, &i, __sync_format_help,"%s");
1014      ctk_help_heading(b, &i, "Sync Status");
1015 -    ctk_help_para(b, &i, __sync_status_help);
1016 +    ctk_help_para(b, &i, __sync_status_help,"%s");
1017
1018      if ( ctk_gvo_sync->caps & NV_CTRL_GVO_CAPABILITIES_ADVANCE_SYNC_SKEW ) {
1019          ctk_help_heading(b, &i, "HSync Advance");
1020 -        ctk_help_para(b, &i, __hsync_advance_help);
1021 +        ctk_help_para(b, &i, __hsync_advance_help,"%s");
1022          ctk_help_heading(b, &i, "VSync Advance");
1023 -        ctk_help_para(b, &i, __vsync_advance_help);
1024 +        ctk_help_para(b, &i, __vsync_advance_help,"%s");
1025      } else {
1026          ctk_help_heading(b, &i, "HSync Delay");
1027 -        ctk_help_para(b, &i, __hsync_delay_help);
1028 +        ctk_help_para(b, &i, __hsync_delay_help,"%s");
1029          ctk_help_heading(b, &i, "VSync Delay");
1030 -        ctk_help_para(b, &i, __vsync_delay_help);
1031 +        ctk_help_para(b, &i, __vsync_delay_help,"%s");
1032      }
1033
1034      ctk_help_finish(b);
1035 --- nvidia-settings-319.32/src/gtk+-2.x/ctkpowersavings.c.old   2013-06-29 20:34:38.000000000 +0200
1036 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkpowersavings.c       2013-06-29 20:35:01.000000000 +0200
1037 @@ -222,7 +222,7 @@
1038      ctk_help_title(b, &i, "Power Savings Help");
1039
1040      ctk_help_heading(b, &i, "On-Demand VBlank Interrupts");
1041 -    ctk_help_para(b, &i, __vblank_control_help);
1042 +    ctk_help_para(b, &i, __vblank_control_help,"%s");
1043
1044      ctk_help_finish(b);
1045
1046 --- nvidia-settings-319.32/src/gtk+-2.x/ctkecc.c.old    2013-06-29 20:35:51.000000000 +0200
1047 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkecc.c        2013-06-29 20:39:48.000000000 +0200
1048 @@ -207,7 +207,7 @@
1049          snprintf(message, sizeof(message), "ECC %s.", conf_string);
1050      }
1051
1052 -    ctk_config_statusbar_message(ctk_ecc->ctk_config, message);
1053 +    ctk_config_statusbar_message(ctk_ecc->ctk_config, message,"%s");
1054  } /* post_ecc_configuration_update() */
1055
1056
1057 @@ -677,36 +677,36 @@
1058      gtk_text_buffer_get_iter_at_offset(b, &i, 0);
1059
1060      ctk_help_heading(b, &i, "ECC Settings Help");
1061 -    ctk_help_para(b, &i, __ecc_settings_help);
1062 +    ctk_help_para(b, &i, __ecc_settings_help,"%s");
1063
1064      ctk_help_heading(b, &i, "ECC");
1065 -    ctk_help_para(b, &i, __ecc_status_help);
1066 +    ctk_help_para(b, &i, __ecc_status_help,"%s");
1067
1068      if (ctk_ecc->dbit_error_available) {
1069          ctk_help_heading(b, &i, "Double-bit ECC Errors");
1070 -        ctk_help_para(b, &i, __dbit_error_help);
1071 +        ctk_help_para(b, &i, __dbit_error_help,"%s");
1072      }
1073      if (ctk_ecc->aggregate_dbit_error_available) {
1074          ctk_help_heading(b, &i, "Aggregate Double-bit ECC Errors");
1075 -        ctk_help_para(b, &i, __aggregate_dbit_error_help);
1076 +        ctk_help_para(b, &i, __aggregate_dbit_error_help,"%s");
1077      }
1078      ctk_help_heading(b, &i, "ECC Configuration");
1079 -    ctk_help_para(b, &i, __configuration_status_help);
1080 +    ctk_help_para(b, &i, __configuration_status_help,"%s");
1081
1082      ctk_help_heading(b, &i, "Enable ECC");
1083 -    ctk_help_para(b, &i, __ecc_status_help);
1084 +    ctk_help_para(b, &i, __ecc_status_help,"%s");
1085
1086      if (ctk_ecc->dbit_error_available) {
1087          ctk_help_heading(b, &i, "Clear ECC Errors");
1088 -        ctk_help_para(b, &i, __clear_button_help);
1089 +        ctk_help_para(b, &i, __clear_button_help,"%s");
1090      }
1091      if (ctk_ecc->aggregate_dbit_error_available) {
1092          ctk_help_heading(b, &i, "Clear Aggregate ECC Errors");
1093 -        ctk_help_para(b, &i, __clear_aggregate_button_help);
1094 +        ctk_help_para(b, &i, __clear_aggregate_button_help,"%s");
1095      }
1096
1097      ctk_help_heading(b, &i, "Reset Default Configuration");
1098 -    ctk_help_para(b, &i, __reset_default_config_button_help);
1099 +    ctk_help_para(b, &i, __reset_default_config_button_help,"%s");
1100
1101      ctk_help_finish(b);
1102
1103 --- nvidia-settings-319.32/src/gtk+-2.x/ctkappprofile.c.old     2013-06-29 20:40:53.000000000 +0200
1104 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkappprofile.c 2013-06-29 20:41:34.000000000 +0200
1105 @@ -4068,8 +4068,8 @@
1106      ctk_help_para(b, &i, "This NVIDIA® Linux Graphics Driver supports detection of the following features:");
1107
1108      for (j = 0; j < NUM_RULE_FEATURES; j++) {
1109 -        ctk_help_term(b, &i, rule_feature_label_strings[j]);
1110 -        ctk_help_para(b, &i, rule_feature_help_text[j]);
1111 +        ctk_help_term(b, &i, rule_feature_label_strings[j],"%s");
1112 +        ctk_help_para(b, &i, rule_feature_help_text[j],"%s");
1113      }
1114
1115      ctk_help_heading(b, &i, "Supported Setting Keys");
1116 @@ -4078,8 +4078,8 @@
1117                           "keys. For more information on a given key, please consult the README.");
1118
1119      for (j = 0; j < NUM_PROFILE_SETTINGS; j++) {
1120 -        ctk_help_term(b, &i, profile_setting_keys[j]);
1121 -        ctk_help_para(b, &i, profile_setting_descriptions[j]);
1122 +        ctk_help_term(b, &i, profile_setting_keys[j],"%s");
1123 +        ctk_help_para(b, &i, profile_setting_descriptions[j],"%s");
1124      }
1125
1126      ctk_help_finish(b);
1127 --- nvidia-settings-319.32/src/gtk+-2.x/ctkcolorcontrols.c.old  2013-06-29 20:54:53.000000000 +0200
1128 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkcolorcontrols.c      2013-06-29 20:55:20.000000000 +0200
1129 @@ -523,13 +523,13 @@
1130      }
1131
1132      ctk_help_heading(b, i, "Color Controls");
1133 -    ctk_help_para(b, i, __color_controls_help);
1134 +    ctk_help_para(b, i, __color_controls_help,"%s");
1135
1136      ctk_help_term(b, i, "Color Space");
1137 -    ctk_help_para(b, i, __color_space_help);
1138 +    ctk_help_para(b, i, __color_space_help,"%s");
1139
1140      ctk_help_term(b, i, "Color Range");
1141 -    ctk_help_para(b, i, __color_range_help);
1142 +    ctk_help_para(b, i, __color_range_help,"%s");
1143  } /* add_color_controls_help() */
1144
1145
1146 --- nvidia-settings-319.32/src/gtk+-2.x/ctk3dvisionpro.c.old    2013-06-29 20:58:38.000000000 +0200
1147 +++ nvidia-settings-319.32/src/gtk+-2.x/ctk3dvisionpro.c        2013-06-29 20:59:46.000000000 +0200
1148 @@ -1778,7 +1778,7 @@
1149                           "with the hub.");
1150
1151      ctk_help_heading(b, &i, "Add glasses");
1152 -    ctk_help_para(b, &i, __add_glasses_tooltip);
1153 +    ctk_help_para(b, &i, __add_glasses_tooltip,"%s");
1154      ctk_help_para(b, &i, "This action is used to set up new 3D Vision Pro Glasses. "
1155                           "On clicking this button the hub enters into pairing mode. "
1156                           "Follow the instructions on Add Glasses dialog box. "
1157 @@ -1787,7 +1787,7 @@
1158                           " glasses or 'Cancel' if do not wish to store them.");
1159
1160      ctk_help_heading(b, &i, "Refresh Glasses' Information");
1161 -    ctk_help_para(b, &i, __refresh_tooltip);
1162 +    ctk_help_para(b, &i, __refresh_tooltip,"%s");
1163      ctk_help_para(b, &i, "Refresh glasses information is typically required when- \n"
1164                           "o Glasses move in and out of the range.\n"
1165                           "o Get the updated battery level of all the glasses.");
1166 @@ -1799,18 +1799,18 @@
1167                           "for a few seconds.");
1168
1169      ctk_help_heading(b, &i, "Rename glasses");
1170 -    ctk_help_para(b, &i, __rename_tooltip);
1171 +    ctk_help_para(b, &i, __rename_tooltip,"%s");
1172      ctk_help_para(b, &i, "Select the glasses from the list of paired glasses "
1173                           "that you want to rename and provide an unique new name.");
1174
1175      ctk_help_heading(b, &i, "Remove glasses");
1176 -    ctk_help_para(b, &i, __remove_glasses_tooltip);
1177 +    ctk_help_para(b, &i, __remove_glasses_tooltip,"%s");
1178      ctk_help_para(b, &i, "Select the glasses from the list of paired glasses "
1179                           "that you want to remove. On removal glasses get "
1180                           "unpaired and will not sync to the hub.");
1181
1182      ctk_help_heading(b, &i, "Glasses Information");
1183 -    ctk_help_para(b, &i, __goggle_info_tooltip);
1184 +    ctk_help_para(b, &i, __goggle_info_tooltip,"%s");
1185
1186      ctk_help_heading(b, &i, "Glasses Name");
1187      ctk_help_para(b, &i, "Each pair of glasses has an unique name and the name should "
1188 @@ -1839,7 +1839,7 @@
1189                           "\tNo Signal\t\t [0%%]");
1190
1191      ctk_help_heading(b, &i, "Hub Range");
1192 -    ctk_help_para(b, &i, __channel_range_tooltip);
1193 +    ctk_help_para(b, &i, __channel_range_tooltip,"%s");
1194      ctk_help_para(b, &i, "The hub range is the farthest distance that the "
1195                           "glasses can synchronize with the 3D Vision Pro Hub. "
1196                           "You can reduce the hub range to limit the experience "
1197 --- nvidia-settings-319.32/src/gtk+-2.x/ctkvdpau.c.old  2013-06-29 21:02:16.000000000 +0200
1198 +++ nvidia-settings-319.32/src/gtk+-2.x/ctkvdpau.c      2013-06-29 21:04:49.000000000 +0200
1199 @@ -454,7 +454,7 @@
1200                      str1 = g_string_append(str1, s);
1201                  }
1202              }
1203 -            label = gtk_label_new(g_strdup_printf(str1->str));
1204 +            label = gtk_label_new(g_strdup_printf(str1->str,"%s"));
1205              gtk_label_set_selectable(GTK_LABEL(label), TRUE);
1206              gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1207              gtk_table_attach(GTK_TABLE(table), label, 3, 4, count+1, count+2,
1208 @@ -792,7 +792,7 @@
1209                      str1 = g_string_append(str1, s);
1210                  }
1211              }
1212 -            label = gtk_label_new(g_strdup_printf(str1->str));
1213 +            label = gtk_label_new(g_strdup_printf(str1->str,"%s"));
1214              gtk_label_set_selectable(GTK_LABEL(label), TRUE);
1215              gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1216              gtk_table_attach(GTK_TABLE(table), label, 4, 5, count+1, count+2,
1217 @@ -1541,43 +1541,43 @@
1218      gtk_text_buffer_get_iter_at_offset(b, &i, 0);
1219
1220      ctk_help_title(b, &i, "VDPAU Information Help");
1221 -    ctk_help_para(b, &i, __vdpau_information_label_help);
1222 +    ctk_help_para(b, &i, __vdpau_information_label_help,"%s");
1223
1224      ctk_help_heading(b, &i, "Base Information");
1225 -    ctk_help_para(b, &i, __base_information_help);
1226 +    ctk_help_para(b, &i, __base_information_help,"%s");
1227
1228      ctk_help_heading(b, &i, "API Version");
1229 -    ctk_help_para(b, &i, __vdpau_api_version_help);
1230 +    ctk_help_para(b, &i, __vdpau_api_version_help,"%s");
1231
1232      ctk_help_heading(b, &i, "Supported Codecs");
1233 -    ctk_help_para(b, &i, __supported_codecs_help);
1234 +    ctk_help_para(b, &i, __supported_codecs_help,"%s");
1235
1236      ctk_help_heading(b, &i, "Surface Limits");
1237 -    ctk_help_para(b, &i, __surface_limits_help);
1238 +    ctk_help_para(b, &i, __surface_limits_help,"%s");
1239
1240      ctk_help_heading(b, &i, "Video Surface");
1241 -    ctk_help_para(b, &i, __video_surface_help);
1242 +    ctk_help_para(b, &i, __video_surface_help,"%s");
1243
1244      ctk_help_heading(b, &i, "Output Surface");
1245 -    ctk_help_para(b, &i, __ouput_surface_help);
1246 +    ctk_help_para(b, &i, __ouput_surface_help,"%s");
1247
1248      ctk_help_heading(b, &i, "Bitmap Surface");
1249 -    ctk_help_para(b, &i, __bitmap_surface_help);
1250 +    ctk_help_para(b, &i, __bitmap_surface_help,"%s");
1251
1252      ctk_help_heading(b, &i, "Decoder Limits");
1253 -    ctk_help_para(b, &i, __decoder_limits_help);
1254 +    ctk_help_para(b, &i, __decoder_limits_help,"%s");
1255
1256      ctk_help_heading(b, &i, "Video Mixer");
1257 -    ctk_help_para(b, &i, __video_mixer_help);
1258 +    ctk_help_para(b, &i, __video_mixer_help,"%s");
1259
1260      ctk_help_term(b, &i, "Feature");
1261 -    ctk_help_para(b, &i, __video_mixer_feature_help);
1262 +    ctk_help_para(b, &i, __video_mixer_feature_help,"%s");
1263
1264      ctk_help_term(b, &i, "Parameter");
1265 -    ctk_help_para(b, &i, __video_mixer_parameter_help);
1266 +    ctk_help_para(b, &i, __video_mixer_parameter_help,"%s");
1267
1268      ctk_help_term(b, &i, "Attribute");
1269 -    ctk_help_para(b, &i, __video_mixer_attribute_help);
1270 +    ctk_help_para(b, &i, __video_mixer_attribute_help,"%s");
1271
1272      ctk_help_finish(b);
1273      return b;