diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-29 23:25:59 +0200 |
| commit | 6944ad9f9346341ee0fd120ec3ed0b7b56406436 (patch) | |
| tree | ae59422da384a9463c306e1983be5ac46ff97c7d /src/plugins | |
| parent | 803e11e1c311a7ba4923d8d438eafa7ff62b463d (diff) | |
| parent | 72e3d4c55a6569d966059f762824c38d06055871 (diff) | |
Merge tag 'upstream/0.25.0'
Upstream version 0.25.0
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/ManifestWidget.c | 8 | ||||
| -rw-r--r-- | src/plugins/Plugins.c | 18 | ||||
| -rw-r--r-- | src/plugins/Plugins.vala | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c index fdc843c..486c98c 100644 --- a/src/plugins/ManifestWidget.c +++ b/src/plugins/ManifestWidget.c @@ -1430,7 +1430,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1433 "ManifestWidget.c" - goto __catch33_g_error; + goto __catch34_g_error; } #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" _tmp53_ = _tmp50_; @@ -1444,8 +1444,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _g_object_unref0 (_tmp50_); #line 1446 "ManifestWidget.c" } - goto __finally33; - __catch33_g_error: + goto __finally34; + __catch34_g_error: { GError* err = NULL; PluginsExtensionPoint* _tmp54_ = NULL; @@ -1473,7 +1473,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type _g_error_free0 (err); #line 1475 "ManifestWidget.c" } - __finally33: + __finally34: #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala" diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c index 4928cf4..f5c638c 100644 --- a/src/plugins/Plugins.c +++ b/src/plugins/Plugins.c @@ -1894,11 +1894,11 @@ void plugins_init (GError** error) { #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1896 "Plugins.c" - goto __catch31_g_error; + goto __catch32_g_error; } } - goto __finally31; - __catch31_g_error: + goto __finally32; + __catch32_g_error: { GError* err = NULL; GFile* _tmp13_ = NULL; @@ -1928,7 +1928,7 @@ void plugins_init (GError** error) { _g_error_free0 (err); #line 1929 "Plugins.c" } - __finally31: + __finally32: #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3691,7 +3691,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _tmp2_ = _tmp1_; #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" - g_debug ("Plugins.vala:316: Searching %s for plugins ...", _tmp2_); + g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp2_); #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" _g_free0 (_tmp2_); #line 320 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" @@ -3801,11 +3801,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 3803 "Plugins.c" - goto __catch32_g_error; + goto __catch33_g_error; } } - goto __finally32; - __catch32_g_error: + goto __finally33; + __catch33_g_error: { GError* err = NULL; GFile* _tmp18_ = NULL; @@ -3835,7 +3835,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) { _g_error_free0 (err); #line 3836 "Plugins.c" } - __finally32: + __finally33: #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala" diff --git a/src/plugins/Plugins.vala b/src/plugins/Plugins.vala index 0e03f67..5f6613c 100644 --- a/src/plugins/Plugins.vala +++ b/src/plugins/Plugins.vala @@ -313,7 +313,7 @@ private bool is_shared_library(File file) { } private void search_for_plugins(File dir) throws Error { - debug("Searching %s for plugins ...", dir.get_path()); + debug("Searching %s for plugins…", dir.get_path()); // build a set of module names sans file extension ... this is to deal with the question of // .so vs. .la existing in the same directory (and letting GModule deal with the problem) |