← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sensors-applet/trusty

« back to all changes in this revision

Viewing changes to sensors-applet/prefs-dialog.h

  • Committer: Bazaar Package Importer
  • Author(s): Nanley Chery
  • Date: 2010-05-22 22:25:13 UTC
  • mfrom: (1.1.13 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100522222513-1cg5k0n5hv337u4u
Tags: 2.2.5-4ubuntu1
https://launchpad.net/bugs/380669
https://launchpad.net/bugs/249955
* Merge from debian testing (LP: #380669, #249955). Remaining changes:
  - debian/rules:
    + Enable nvidia compilation flag.
  - debian/control:
    + Build-depend on nvidia-settings and update description accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sensors-applet/prefs-dialog.h
45
45
        
46
46
        /* widgets for sensors tree */
47
47
        GtkTreeView *view; 
48
 
#if !GTK_CHECK_VERSION(2,12,0)
49
 
        GtkTooltips *view_tooltips;
50
 
#endif
51
48
        GtkTreeViewColumn *id_column, *label_column, *enable_column, *icon_column;
52
49
        GtkCellRenderer *id_renderer, *label_renderer, *enable_renderer, *icon_renderer;
53
50
        GtkScrolledWindow *scrolled_window;