diff options
author | Ryan Lortie <desrt@desrt.ca> | 2015-02-11 15:06:59 -0500 |
---|---|---|
committer | Debarshi Ray <debarshir@gnome.org> | 2017-03-01 19:08:58 +0100 |
commit | 9a0b730268d823a51c270a030bd5b09fe82aa3dc (patch) | |
tree | ac0376677b2557ad0990065393bcc9cce2016740 | |
parent | 5ea7f6d8cb18b3383afae3c50463b91e5dec0eff (diff) | |
download | cheese-gnome-3-14.tar.gz |
preferences: resolve ambiguous 'ListStore' usagegnome-3-14
There is now a GLib.ListStore as well, so make sure we use the full name
Gtk.ListStore to avoid an ambiguous reference.
-rw-r--r-- | src/cheese-preferences.vala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala index 835f9aa2..21b68f38 100644 --- a/src/cheese-preferences.vala +++ b/src/cheese-preferences.vala @@ -101,7 +101,7 @@ public PreferencesDialog (Cheese.Camera camera) private void initialize_camera_devices () { unowned GLib.PtrArray devices = camera.get_camera_devices (); - camera_model = new ListStore (2, typeof (string), typeof (Cheese.CameraDevice)); + camera_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.CameraDevice)); source_combo.model = camera_model; source_combo.sensitive = false; @@ -120,7 +120,7 @@ public PreferencesDialog (Cheese.Camera camera) private void setup_resolutions_for_device (Cheese.CameraDevice device) { var formats = device.get_format_list (); - ListStore resolution_model = new ListStore (2, typeof (string), + Gtk.ListStore resolution_model = new Gtk.ListStore (2, typeof (string), typeof (Cheese.VideoFormat)); photo_resolution_combo.model = resolution_model; |