diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-09 06:55:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-09 06:55:40 +0100 |
| commit | 71376a8631a4262793351e3431b3bc2df93b15dd (patch) | |
| tree | a7b7313268ffc0e98a0f51e15fb2477b00194458 /src/Dialogs.c | |
| parent | 524a49de17c1c432b0ad6b16f11e64586bf10e7c (diff) | |
| parent | 7152401783578b56343f578b4ec920998660de33 (diff) | |
Merge tag 'upstream/0.25.0.1'
Upstream version 0.25.0.1
Diffstat (limited to 'src/Dialogs.c')
| -rw-r--r-- | src/Dialogs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Dialogs.c b/src/Dialogs.c index 0820882..d3805b9 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1,4 +1,4 @@ -/* Dialogs.c generated by valac 0.34.1, the Vala compiler +/* Dialogs.c generated by valac 0.34.2, the Vala compiler * generated from Dialogs.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -19043,7 +19043,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala" gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1); #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" - _tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1); + _tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1); #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala" combo_store = _tmp17_; #line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19158,7 +19158,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_value_init (&_tmp40_, GDK_TYPE_PIXBUF); + g_value_init (&_tmp40_, gdk_pixbuf_get_type ()); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" g_value_take_object (&_tmp40_, _tmp39_); #line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala" @@ -19210,7 +19210,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self, #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" _tmp50_ = icon_pixbuf; #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" - g_value_init (&_tmp51_, GDK_TYPE_PIXBUF); + g_value_init (&_tmp51_, gdk_pixbuf_get_type ()); #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" g_value_set_object (&_tmp51_, _tmp50_); #line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala" |