diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:25:40 +0100 |
| commit | cd16e7b4a394b6ce885a618d8a96eccd662208bb (patch) | |
| tree | c9bcd713dbea9467783f8d82c63218af91192da1 /src/BatchImport.c | |
| parent | b1cb72d29fa13b3b6f9f5fe66083dd60930a2b71 (diff) | |
| parent | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (diff) | |
Merge tag 'upstream/0.25.2'
Upstream version 0.25.2
Diffstat (limited to 'src/BatchImport.c')
| -rw-r--r-- | src/BatchImport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BatchImport.c b/src/BatchImport.c index f8b107c..bc67168 100644 --- a/src/BatchImport.c +++ b/src/BatchImport.c @@ -1,4 +1,4 @@ -/* BatchImport.c generated by valac 0.34.2, the Vala compiler +/* BatchImport.c generated by valac 0.32.1, the Vala compiler * generated from BatchImport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -5472,7 +5472,7 @@ BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const #line 5473 "BatchImport.c" GeeHashSet* _tmp21_ = NULL; #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp21_ = gee_hash_set_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); + _tmp21_ = gee_hash_set_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" _g_object_unref0 (self->priv->skipset); #line 491 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10413,7 +10413,7 @@ static void batch_import_class_init (BatchImportClass * klass) { #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_new ("progress", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT64_UINT64, G_TYPE_NONE, 2, G_TYPE_UINT64, G_TYPE_UINT64); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" - g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, gdk_pixbuf_get_type (), G_TYPE_INT); + g_signal_new ("imported", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_INT, G_TYPE_NONE, 3, TYPE_MEDIA_SOURCE, GDK_TYPE_PIXBUF, G_TYPE_INT); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" g_signal_new ("fatal_error", TYPE_BATCH_IMPORT, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__ENUM_STRING, G_TYPE_NONE, 2, TYPE_IMPORT_RESULT, G_TYPE_STRING); #line 402 "/home/jens/Source/shotwell/src/BatchImport.vala" @@ -10460,7 +10460,7 @@ static void batch_import_instance_init (BatchImport * self) { #line 428 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->last_preparing_ms = (gulong) 0; #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" - _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); #line 431 "/home/jens/Source/shotwell/src/BatchImport.vala" self->priv->imported_full_md5_table = _tmp0_; #line 433 "/home/jens/Source/shotwell/src/BatchImport.vala" |