← Back to branch summary

~ubuntu-branches/ubuntu/precise/nvidia-settings/precise

« back to all changes in this revision

Viewing changes to src/gtk+-2.x/ctkgvi.h

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2010-03-05 11:19:05 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20100305111905-4ximslurqdws2jtk
Tags: 195.36.08-0ubuntu1
* New upstream release:
  - Fixed an X server crash caused by starting nvidia-settings while
    X was not on the active VT.
  - Fixed an nvidia-settings bug that produced many "Bad argument"
    warning messages when running nvidia-settings --query all.
* Drop patches 03_xf86vidmode-rampsize-check.patch and
  04_include_xf86vmproto.patch as the problem is fixed
  in the upstream code now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gtk+-2.x/ctkgvi.h
26
26
#define __CTK_GVI_H__
27
27
 
28
28
#include "NvCtrlAttributes.h"
 
29
#include "ctkevent.h"
29
30
#include "ctkconfig.h"
30
31
 
31
32
G_BEGIN_DECLS
61
62
    int num_jacks;
62
63
    int max_channels_per_jack;
63
64
 
 
65
    GtkWidget *gpu_name;
 
66
 
64
67
    GtkWidget *jack_channel_omenu;
65
68
 
66
69
    GtkWidget *input_info_vbox;
75
78
};
76
79
 
77
80
GType          ctk_gvi_get_type    (void) G_GNUC_CONST;
78
 
GtkWidget*     ctk_gvi_new         (NvCtrlAttributeHandle *, CtkConfig *);
 
81
GtkWidget*     ctk_gvi_new         (NvCtrlAttributeHandle *, CtkConfig *,
 
82
                                    CtkEvent *);
79
83
GtkTextBuffer* ctk_gvi_create_help (GtkTextTagTable *, CtkGvi *);
80
84
 
81
85
void           ctk_gvi_start_timer (GtkWidget *);