← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nvidia-settings/quantal

« back to all changes in this revision

Viewing changes to src/gtk+-2.x/ctkclocks.c

  • Committer: Package Import Robot
  • Author(s): Alberto Milone
  • Date: 2012-10-04 12:58:33 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20121004125833-h1r81skpfza8teae
Tags: 304.51-0ubuntu1
* New upstream release:
  - Fixed a bug that sometimes caused the display layout area
    of the nvidia-settings control panel to be laid out
    incorrectly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gtk+-2.x/ctkclocks.c
793
793
{
794
794
    CtkClocks *ctk_object = CTK_CLOCKS(user_data);
795
795
    gboolean enabled;
796
 
    ReturnStatus ret;
797
796
    int value;
798
797
    gint result;
799
798
    
836
835
 
837
836
    
838
837
    /* Update the server */
839
 
    
840
 
    ret = NvCtrlSetAttribute(ctk_object->handle,
841
 
                             NV_CTRL_GPU_OVERCLOCKING_STATE, value);
842
 
    
 
838
 
 
839
    NvCtrlSetAttribute(ctk_object->handle,
 
840
                       NV_CTRL_GPU_OVERCLOCKING_STATE, value);
 
841
 
843
842
    /* Update the GUI */
844
843
    
845
844
    overclocking_state_update_gui(ctk_object);
1250
1249
static void detect_clocks_clicked(GtkWidget *widget, gpointer user_data)
1251
1250
{
1252
1251
    CtkClocks *ctk_object = CTK_CLOCKS(user_data);
1253
 
    ReturnStatus ret;
1254
1252
    gint result;
1255
 
    
 
1253
 
1256
1254
 
1257
1255
    if ( ctk_object->probing_optimal ) {
1258
1256
 
1259
1257
        /* Stop the test for optimal clock freqs */
1260
 
        ret = NvCtrlSetAttribute(ctk_object->handle,
1261
 
                                 NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION,
1262
 
                                 NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_CANCEL);
 
1258
        NvCtrlSetAttribute(ctk_object->handle,
 
1259
                           NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION,
 
1260
                           NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_CANCEL);
1263
1261
    } else {
1264
 
        
 
1262
 
1265
1263
        /* User must hit the OK button to start the testing */
1266
1264
 
1267
1265
        gtk_widget_show_all(ctk_object->detect_dialog);
1273
1271
        case GTK_RESPONSE_ACCEPT:
1274
1272
 
1275
1273
            /* Start the test for optimal clock freqs */
1276
 
            ret = NvCtrlSetAttribute(ctk_object->handle,
1277
 
                                     NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION,
1278
 
                                     NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_START);
 
1274
            NvCtrlSetAttribute(ctk_object->handle,
 
1275
                               NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION,
 
1276
                               NV_CTRL_GPU_OPTIMAL_CLOCK_FREQS_DETECTION_START);
1279
1277
            break;
1280
1278
 
1281
1279
        case GTK_RESPONSE_REJECT: