summaryrefslogtreecommitdiff
path: root/src/Resources.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-06-25 20:55:59 +0200
commitab841afa5cb39058d9ab2cebb67cfe6369443f6e (patch)
tree64961342a79003ee865b3f9f8f41f99f09f37a2e /src/Resources.c
parent49120f48474fc8fdc2448c75d961bc238213cfac (diff)
New upstream version 0.28.3upstream/0.28.3
Diffstat (limited to 'src/Resources.c')
-rw-r--r--src/Resources.c2136
1 files changed, 999 insertions, 1137 deletions
diff --git a/src/Resources.c b/src/Resources.c
index da32009..0db3c0e 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.36.6, the Vala compiler
+/* Resources.c generated by valac 0.40.4, the Vala compiler
* generated from Resources.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
*/
/* defined by ./configure or Makefile and included by gcc -D*/
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -412,7 +413,8 @@ GeeMap* resources_providers = NULL;
#define RESOURCES_FLAG_MENU _ ("_Flag")
#define RESOURCES_UNFLAG_MENU _ ("Un_flag")
gchar* resources_launch_editor_failed (GError* err);
-gchar* resources_add_tags_label (gchar** names, int names_length1);
+gchar* resources_add_tags_label (gchar** names,
+ int names_length1);
gchar* hierarchical_tag_utilities_get_basename (const gchar* in_path);
gchar* resources_delete_tag_menu (const gchar* name);
gchar* resources_delete_tag_label (const gchar* name);
@@ -420,14 +422,19 @@ gchar* resources_delete_tag_label (const gchar* name);
#define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete")
#define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
gchar* resources_rename_tag_menu (const gchar* name);
-gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name);
+gchar* resources_rename_tag_label (const gchar* old_name,
+ const gchar* new_name);
#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…")
#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
#define RESOURCES_MODIFY_TAGS_LABEL _ ("Modify Tags")
-gchar* resources_tag_photos_label (const gchar* name, gint count);
-gchar* resources_tag_photos_tooltip (const gchar* name, gint count);
-gchar* resources_untag_photos_menu (const gchar* name, gint count);
-gchar* resources_untag_photos_label (const gchar* name, gint count);
+gchar* resources_tag_photos_label (const gchar* name,
+ gint count);
+gchar* resources_tag_photos_tooltip (const gchar* name,
+ gint count);
+gchar* resources_untag_photos_menu (const gchar* name,
+ gint count);
+gchar* resources_untag_photos_label (const gchar* name,
+ gint count);
gchar* resources_rename_tag_exists_message (const gchar* name);
gchar* resources_rename_search_exists_message (const gchar* name);
#define RESOURCES_DEFAULT_SAVED_SEARCH_NAME _ ("Saved Search")
@@ -435,7 +442,8 @@ gchar* resources_rename_search_exists_message (const gchar* name);
#define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete")
#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…")
#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…")
-gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name);
+gchar* resources_rename_search_label (const gchar* old_name,
+ const gchar* new_name);
gchar* resources_delete_search_label (const gchar* name);
GType rating_get_type (void) G_GNUC_CONST;
const gchar* resources_rating_label (Rating rating);
@@ -444,8 +452,10 @@ GType rating_filter_get_type (void) G_GNUC_CONST;
gchar* resources_get_rating_filter_tooltip (RatingFilter filter);
gchar* resources_rating_progress (Rating rating);
gchar* resources_get_stars (Rating rating);
-GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale);
-GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
+GdkPixbuf* resources_get_rating_trinket (Rating rating,
+ gint scale);
+GdkPixbuf* resources_get_icon (const gchar* name,
+ gint scale);
void resources_generate_rating_strings (void);
#define RESOURCES_DELETE_PHOTOS_MENU _ ("_Delete")
#define RESOURCES_DELETE_FROM_TRASH_TOOLTIP _ ("Remove the selected photos from the trash")
@@ -465,7 +475,9 @@ void resources_terminate (void);
void resources_fetch_lc_time_format (void);
GType resources_unit_system_get_type (void) G_GNUC_CONST;
ResourcesUnitSystem resources_get_default_measurement_unit (void);
-static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle);
+static gboolean _vala_string_array_contains (const gchar* * stack,
+ int stack_length,
+ const gchar* needle);
gchar* resources_get_hh_mm_format_string (void);
gchar* resources_get_hh_mm_ss_format_string (void);
gchar* resources_get_long_date_format_string (void);
@@ -476,15 +488,24 @@ gchar* resources_get_end_multimonth_span_format_string (void);
gchar* resources_get_ui (const gchar* filename);
#define RESOURCES_NONINTERPRETABLE_BADGE_FILE "noninterpretable-video.png"
GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
-GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
+GdkPixbuf* resources_load_icon (const gchar* name,
+ gint scale);
+GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf,
+ gint scale,
+ GdkInterpType interp,
+ gboolean scale_up);
gchar* resources_get_help_path (void);
GFile* app_dirs_get_exec_dir (void);
-void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error);
-void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error);
+void resources_launch_help (GdkScreen* screen,
+ const gchar* anchor,
+ GError** error);
+void sys_show_uri (GdkScreen* screen,
+ const gchar* uri,
+ GError** error);
gchar* resources_to_css_color (GdkRGBA* color);
#define RESOURCES_ALL_DATA -1
-void resources_style_widget (GtkWidget* widget, const gchar* stylesheet);
+void resources_style_widget (GtkWidget* widget,
+ const gchar* stylesheet);
gint resources_use_header_bar (void);
#define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \
" background-color: @borders;\n" \
@@ -496,470 +517,421 @@ gint resources_use_header_bar (void);
" }"
#define RESOURCES_ONIMAGE_FONT_COLOR "#000000"
#define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)"
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func);
static gint _vala_array_length (gpointer array);
const gchar* RESOURCES_AUTHORS[6] = {"Jim Nelson <jim@yorba.org>", "Lucas Beeler <lucas@yorba.org>", "Allison Barlow <allison@yorba.org>", "Eric Gregory <eric@yorba.org>", "Clinton Rogers <clinton@yorba.org>", NULL};
const gint RESOURCES_rating_thresholds[6] = {0, 1, 25, 50, 75, 99};
const gchar* RESOURCES_IMPERIAL_COUNTRIES[4] = {"unm_US", "es_US", "en_US", "yi_US"};
-gchar* resources_launch_editor_failed (GError* err) {
+gchar*
+resources_launch_editor_failed (GError* err)
+{
gchar* result = NULL;
- GError* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
-#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = err;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = _tmp0_->message;
+ _tmp0_ = err->message;
#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (_ ("Unable to launch editor: %s"), _tmp1_);
+ _tmp1_ = g_strdup_printf (_ ("Unable to launch editor: %s"), _tmp0_);
#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 495 "Resources.c"
+#line 519 "Resources.c"
}
-gchar* resources_add_tags_label (gchar** names, int names_length1) {
+gchar*
+resources_add_tags_label (gchar** names,
+ int names_length1)
+{
gchar* result = NULL;
- gchar** _tmp0_;
- gint _tmp0__length1;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = names;
#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0__length1 = names_length1;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp0__length1 == 1) {
-#line 509 "Resources.c"
- gchar** _tmp1_;
- gint _tmp1__length1;
- const gchar* _tmp2_;
+ if (names_length1 == 1) {
+#line 530 "Resources.c"
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
+ gchar* _tmp2_;
gchar* _tmp3_;
gchar* _tmp4_;
- gchar* _tmp5_;
- gchar* _tmp6_;
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = names;
+ _tmp0_ = names[0];
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1__length1 = names_length1;
+ _tmp1_ = hierarchical_tag_utilities_get_basename (_tmp0_);
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = _tmp1_[0];
+ _tmp2_ = _tmp1_;
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = hierarchical_tag_utilities_get_basename (_tmp2_);
+ _tmp3_ = g_strdup_printf (_ ("Add Tag “%s”"), _tmp2_);
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp4_ = _tmp3_;
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = g_strdup_printf (_ ("Add Tag “%s”"), _tmp4_);
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = _tmp5_;
+ _g_free0 (_tmp2_);
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp4_);
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp6_;
+ result = _tmp4_;
#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 537 "Resources.c"
+#line 552 "Resources.c"
} else {
- gchar** _tmp7_;
- gint _tmp7__length1;
-#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = names;
-#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7__length1 = names_length1;
#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp7__length1 == 2) {
-#line 547 "Resources.c"
- gchar** _tmp8_;
- gint _tmp8__length1;
- const gchar* _tmp9_;
+ if (names_length1 == 2) {
+#line 556 "Resources.c"
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
gchar* _tmp10_;
gchar* _tmp11_;
- gchar** _tmp12_;
- gint _tmp12__length1;
- const gchar* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- gchar* _tmp17_;
-#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = names;
-#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8__length1 = names_length1;
-#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = _tmp8_[0];
-#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = hierarchical_tag_utilities_get_basename (_tmp9_);
+ gchar* _tmp12_;
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = _tmp10_;
+ _tmp5_ = names[0];
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = names;
+ _tmp6_ = hierarchical_tag_utilities_get_basename (_tmp5_);
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12__length1 = names_length1;
+ _tmp7_ = _tmp6_;
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = _tmp12_[1];
+ _tmp8_ = names[1];
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = hierarchical_tag_utilities_get_basename (_tmp13_);
+ _tmp9_ = hierarchical_tag_utilities_get_basename (_tmp8_);
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = _tmp14_;
+ _tmp10_ = _tmp9_;
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = g_strdup_printf (_ ("Add Tags “%s” and “%s”"), _tmp11_, _tmp15_);
+ _tmp11_ = g_strdup_printf (_ ("Add Tags “%s” and “%s”"), _tmp7_, _tmp10_);
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp17_ = _tmp16_;
+ _tmp12_ = _tmp11_;
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp15_);
+ _g_free0 (_tmp10_);
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp11_);
+ _g_free0 (_tmp7_);
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp17_;
+ result = _tmp12_;
#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 592 "Resources.c"
+#line 589 "Resources.c"
} else {
- gchar* _tmp18_;
+ gchar* _tmp13_;
#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp18_ = g_strdup (C_ ("UndoRedo menu entry", "Add Tags"));
+ _tmp13_ = g_strdup (C_ ("UndoRedo menu entry", "Add Tags"));
#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp18_;
+ result = _tmp13_;
#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 601 "Resources.c"
+#line 598 "Resources.c"
}
}
}
-gchar* resources_delete_tag_menu (const gchar* name) {
+gchar*
+resources_delete_tag_menu (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf (_ ("_Delete Tag “%s”"), name);
#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("_Delete Tag “%s”"), _tmp0_);
-#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 621 "Resources.c"
+#line 617 "Resources.c"
}
-gchar* resources_delete_tag_label (const gchar* name) {
+gchar*
+resources_delete_tag_label (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
-#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("Delete Tag “%s”"), _tmp0_);
+ _tmp0_ = g_strdup_printf (_ ("Delete Tag “%s”"), name);
#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 639 "Resources.c"
+#line 634 "Resources.c"
}
-gchar* resources_rename_tag_menu (const gchar* name) {
+gchar*
+resources_rename_tag_menu (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf (_ ("Re_name Tag “%s”…"), name);
#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("Re_name Tag “%s”…"), _tmp0_);
-#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 657 "Resources.c"
+#line 651 "Resources.c"
}
-gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name) {
+gchar*
+resources_rename_tag_label (const gchar* old_name,
+ const gchar* new_name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (old_name != NULL, NULL);
#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (new_name != NULL, NULL);
#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = old_name;
+ _tmp0_ = g_strdup_printf (_ ("Rename Tag “%s” to “%s”"), old_name, new_name);
#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = new_name;
-#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (_ ("Rename Tag “%s” to “%s”"), _tmp0_, _tmp1_);
-#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 680 "Resources.c"
+#line 671 "Resources.c"
}
-gchar* resources_tag_photos_label (const gchar* name, gint count) {
+gchar*
+resources_tag_photos_label (const gchar* name,
+ gint count)
+{
gchar* result = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = count;
-#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = name;
+ _tmp0_ = g_strdup_printf (ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) count), name);
#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_), _tmp1_);
-#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 701 "Resources.c"
+#line 689 "Resources.c"
}
-gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
+gchar*
+resources_tag_photos_tooltip (const gchar* name,
+ gint count)
+{
gchar* result = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = count;
+ _tmp0_ = g_strdup_printf (ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) count), name);
#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = name;
-#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_), _tmp1_);
-#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 722 "Resources.c"
+#line 707 "Resources.c"
}
-gchar* resources_untag_photos_menu (const gchar* name, gint count) {
+gchar*
+resources_untag_photos_menu (const gchar* name,
+ gint count)
+{
gchar* result = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = count;
-#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = name;
+ _tmp0_ = g_strdup_printf (ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) count), name);
#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_), _tmp1_);
-#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 743 "Resources.c"
+#line 725 "Resources.c"
}
-gchar* resources_untag_photos_label (const gchar* name, gint count) {
+gchar*
+resources_untag_photos_label (const gchar* name,
+ gint count)
+{
gchar* result = NULL;
- gint _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = count;
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = name;
+ _tmp0_ = g_strdup_printf (ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) count), name);
#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_), _tmp1_);
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 764 "Resources.c"
+#line 743 "Resources.c"
}
-gchar* resources_rename_tag_exists_message (const gchar* name) {
+gchar*
+resources_rename_tag_exists_message (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf (_ ("Unable to rename tag to “%s” because the tag already exists."), name);
#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("Unable to rename tag to “%s” because the tag already exists."), _tmp0_);
-#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 782 "Resources.c"
+#line 760 "Resources.c"
}
-gchar* resources_rename_search_exists_message (const gchar* name) {
+gchar*
+resources_rename_search_exists_message (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf (_ ("Unable to rename search to “%s” because the search already exists."), name);
#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("Unable to rename search to “%s” because the search already exists."), _tmp0_);
-#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 800 "Resources.c"
+#line 777 "Resources.c"
}
-gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name) {
+gchar*
+resources_rename_search_label (const gchar* old_name,
+ const gchar* new_name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
+ gchar* _tmp0_;
#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (old_name != NULL, NULL);
#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (new_name != NULL, NULL);
#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = old_name;
-#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = new_name;
+ _tmp0_ = g_strdup_printf (_ ("Rename Search “%s” to “%s”"), old_name, new_name);
#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (_ ("Rename Search “%s” to “%s”"), _tmp0_, _tmp1_);
-#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 823 "Resources.c"
+#line 797 "Resources.c"
}
-gchar* resources_delete_search_label (const gchar* name) {
+gchar*
+resources_delete_search_label (const gchar* name)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf (_ ("Delete Search “%s”"), name);
#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf (_ ("Delete Search “%s”"), _tmp0_);
-#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 841 "Resources.c"
+#line 814 "Resources.c"
}
-const gchar* resources_rating_label (Rating rating) {
+const gchar*
+resources_rating_label (Rating rating)
+{
const gchar* result = NULL;
- Rating _tmp0_;
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = rating;
-#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (rating) {
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_REJECTED:
-#line 854 "Resources.c"
+#line 826 "Resources.c"
{
#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
result = RESOURCES_RATE_REJECTED_LABEL;
#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 860 "Resources.c"
+#line 832 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_UNRATED:
-#line 864 "Resources.c"
+#line 836 "Resources.c"
{
#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
result = RESOURCES_RATE_UNRATED_LABEL;
#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 870 "Resources.c"
+#line 842 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_ONE:
-#line 874 "Resources.c"
+#line 846 "Resources.c"
{
- const gchar* _tmp1_;
+ const gchar* _tmp0_;
#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = resources_RATE_ONE_LABEL;
+ _tmp0_ = resources_RATE_ONE_LABEL;
#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 883 "Resources.c"
+#line 855 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_TWO:
-#line 887 "Resources.c"
+#line 859 "Resources.c"
{
- const gchar* _tmp2_;
+ const gchar* _tmp1_;
#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = resources_RATE_TWO_LABEL;
+ _tmp1_ = resources_RATE_TWO_LABEL;
#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 896 "Resources.c"
+#line 868 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_THREE:
-#line 900 "Resources.c"
+#line 872 "Resources.c"
{
- const gchar* _tmp3_;
+ const gchar* _tmp2_;
#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = resources_RATE_THREE_LABEL;
+ _tmp2_ = resources_RATE_THREE_LABEL;
#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 909 "Resources.c"
+#line 881 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FOUR:
-#line 913 "Resources.c"
+#line 885 "Resources.c"
{
- const gchar* _tmp4_;
+ const gchar* _tmp3_;
#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = resources_RATE_FOUR_LABEL;
+ _tmp3_ = resources_RATE_FOUR_LABEL;
#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 922 "Resources.c"
+#line 894 "Resources.c"
}
#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FIVE:
-#line 926 "Resources.c"
+#line 898 "Resources.c"
{
- const gchar* _tmp5_;
+ const gchar* _tmp4_;
#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = resources_RATE_FIVE_LABEL;
+ _tmp4_ = resources_RATE_FIVE_LABEL;
#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 935 "Resources.c"
+#line 907 "Resources.c"
}
default:
{
@@ -967,103 +939,102 @@ const gchar* resources_rating_label (Rating rating) {
result = RESOURCES_RATE_UNRATED_LABEL;
#line 444 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 943 "Resources.c"
+#line 915 "Resources.c"
}
}
}
-const gchar* resources_rating_combo_box (Rating rating) {
+const gchar*
+resources_rating_combo_box (Rating rating)
+{
const gchar* result = NULL;
- Rating _tmp0_;
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = rating;
-#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (rating) {
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_REJECTED:
-#line 958 "Resources.c"
+#line 929 "Resources.c"
{
#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
result = RESOURCES_RATE_REJECTED_COMBO_BOX;
#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 964 "Resources.c"
+#line 935 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_UNRATED:
-#line 968 "Resources.c"
+#line 939 "Resources.c"
{
#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
result = RESOURCES_RATE_UNRATED_COMBO_BOX;
#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 974 "Resources.c"
+#line 945 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_ONE:
-#line 978 "Resources.c"
+#line 949 "Resources.c"
{
- const gchar* _tmp1_;
+ const gchar* _tmp0_;
#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = resources_RATE_ONE_MENU;
+ _tmp0_ = resources_RATE_ONE_MENU;
#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 987 "Resources.c"
+#line 958 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_TWO:
-#line 991 "Resources.c"
+#line 962 "Resources.c"
{
- const gchar* _tmp2_;
+ const gchar* _tmp1_;
#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = resources_RATE_TWO_MENU;
+ _tmp1_ = resources_RATE_TWO_MENU;
#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1000 "Resources.c"
+#line 971 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_THREE:
-#line 1004 "Resources.c"
+#line 975 "Resources.c"
{
- const gchar* _tmp3_;
+ const gchar* _tmp2_;
#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = resources_RATE_THREE_MENU;
+ _tmp2_ = resources_RATE_THREE_MENU;
#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1013 "Resources.c"
+#line 984 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FOUR:
-#line 1017 "Resources.c"
+#line 988 "Resources.c"
{
- const gchar* _tmp4_;
+ const gchar* _tmp3_;
#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = resources_RATE_FOUR_MENU;
+ _tmp3_ = resources_RATE_FOUR_MENU;
#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1026 "Resources.c"
+#line 997 "Resources.c"
}
#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FIVE:
-#line 1030 "Resources.c"
+#line 1001 "Resources.c"
{
- const gchar* _tmp5_;
+ const gchar* _tmp4_;
#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = resources_RATE_FIVE_MENU;
+ _tmp4_ = resources_RATE_FIVE_MENU;
#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1039 "Resources.c"
+#line 1010 "Resources.c"
}
default:
{
@@ -1071,462 +1042,441 @@ const gchar* resources_rating_combo_box (Rating rating) {
result = RESOURCES_RATE_UNRATED_MENU;
#line 465 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1047 "Resources.c"
+#line 1018 "Resources.c"
}
}
}
-gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
+gchar*
+resources_get_rating_filter_tooltip (RatingFilter filter)
+{
gchar* result = NULL;
- RatingFilter _tmp0_;
-#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = filter;
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (filter) {
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1062 "Resources.c"
+#line 1032 "Resources.c"
{
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
+ _tmp0_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1071 "Resources.c"
+#line 1041 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_ONE_OR_HIGHER:
-#line 1075 "Resources.c"
+#line 1045 "Resources.c"
{
- const gchar* _tmp2_;
- gchar* _tmp3_;
+ const gchar* _tmp1_;
+ gchar* _tmp2_;
#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
+ _tmp1_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = g_strdup (_tmp2_);
+ _tmp2_ = g_strdup (_tmp1_);
#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1087 "Resources.c"
+#line 1057 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_TWO_OR_HIGHER:
-#line 1091 "Resources.c"
+#line 1061 "Resources.c"
{
- const gchar* _tmp4_;
- gchar* _tmp5_;
+ const gchar* _tmp3_;
+ gchar* _tmp4_;
#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
+ _tmp3_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = g_strdup (_tmp4_);
+ _tmp4_ = g_strdup (_tmp3_);
#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1103 "Resources.c"
+#line 1073 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_THREE_OR_HIGHER:
-#line 1107 "Resources.c"
+#line 1077 "Resources.c"
{
- const gchar* _tmp6_;
- gchar* _tmp7_;
+ const gchar* _tmp5_;
+ gchar* _tmp6_;
#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
+ _tmp5_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = g_strdup (_tmp6_);
+ _tmp6_ = g_strdup (_tmp5_);
#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp7_;
+ result = _tmp6_;
#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1119 "Resources.c"
+#line 1089 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1123 "Resources.c"
+#line 1093 "Resources.c"
{
- const gchar* _tmp8_;
- gchar* _tmp9_;
+ const gchar* _tmp7_;
+ gchar* _tmp8_;
#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
+ _tmp7_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = g_strdup (_tmp8_);
+ _tmp8_ = g_strdup (_tmp7_);
#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp9_;
+ result = _tmp8_;
#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1135 "Resources.c"
+#line 1105 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_FIVE_ONLY:
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1141 "Resources.c"
+#line 1111 "Resources.c"
{
- const gchar* _tmp10_;
- gchar* _tmp11_;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
+ _tmp9_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = g_strdup (_tmp10_);
+ _tmp10_ = g_strdup (_tmp9_);
#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp11_;
+ result = _tmp10_;
#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1153 "Resources.c"
+#line 1123 "Resources.c"
}
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_REJECTED_ONLY:
-#line 1157 "Resources.c"
+#line 1127 "Resources.c"
{
- gchar* _tmp12_;
+ gchar* _tmp11_;
#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
+ _tmp11_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp12_;
+ result = _tmp11_;
#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1166 "Resources.c"
+#line 1136 "Resources.c"
}
default:
#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1171 "Resources.c"
+#line 1141 "Resources.c"
{
- gchar* _tmp13_;
+ gchar* _tmp12_;
#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
+ _tmp12_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp13_;
+ result = _tmp12_;
#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1180 "Resources.c"
+#line 1150 "Resources.c"
}
}
}
-gchar* resources_rating_progress (Rating rating) {
+gchar*
+resources_rating_progress (Rating rating)
+{
gchar* result = NULL;
- Rating _tmp0_;
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = rating;
-#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (rating) {
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_REJECTED:
-#line 1195 "Resources.c"
+#line 1164 "Resources.c"
{
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
+ _tmp0_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1204 "Resources.c"
+#line 1173 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_UNRATED:
-#line 1208 "Resources.c"
+#line 1177 "Resources.c"
{
- gchar* _tmp2_;
+ gchar* _tmp1_;
#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
+ _tmp1_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1217 "Resources.c"
+#line 1186 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_ONE:
-#line 1221 "Resources.c"
+#line 1190 "Resources.c"
{
- const gchar* _tmp3_;
- gchar* _tmp4_;
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = resources_RATE_ONE_PROGRESS;
+ _tmp2_ = resources_RATE_ONE_PROGRESS;
#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = g_strdup (_tmp3_);
+ _tmp3_ = g_strdup (_tmp2_);
#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1233 "Resources.c"
+#line 1202 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_TWO:
-#line 1237 "Resources.c"
+#line 1206 "Resources.c"
{
- const gchar* _tmp5_;
- gchar* _tmp6_;
+ const gchar* _tmp4_;
+ gchar* _tmp5_;
#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = resources_RATE_TWO_PROGRESS;
+ _tmp4_ = resources_RATE_TWO_PROGRESS;
#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = g_strdup (_tmp5_);
+ _tmp5_ = g_strdup (_tmp4_);
#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp6_;
+ result = _tmp5_;
#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1249 "Resources.c"
+#line 1218 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_THREE:
-#line 1253 "Resources.c"
+#line 1222 "Resources.c"
{
- const gchar* _tmp7_;
- gchar* _tmp8_;
+ const gchar* _tmp6_;
+ gchar* _tmp7_;
#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = resources_RATE_THREE_PROGRESS;
+ _tmp6_ = resources_RATE_THREE_PROGRESS;
#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = g_strdup (_tmp7_);
+ _tmp7_ = g_strdup (_tmp6_);
#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp8_;
+ result = _tmp7_;
#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1265 "Resources.c"
+#line 1234 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FOUR:
-#line 1269 "Resources.c"
+#line 1238 "Resources.c"
{
- const gchar* _tmp9_;
- gchar* _tmp10_;
+ const gchar* _tmp8_;
+ gchar* _tmp9_;
#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = resources_RATE_FOUR_PROGRESS;
+ _tmp8_ = resources_RATE_FOUR_PROGRESS;
#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = g_strdup (_tmp9_);
+ _tmp9_ = g_strdup (_tmp8_);
#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp10_;
+ result = _tmp9_;
#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1281 "Resources.c"
+#line 1250 "Resources.c"
}
#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FIVE:
-#line 1285 "Resources.c"
+#line 1254 "Resources.c"
{
- const gchar* _tmp11_;
- gchar* _tmp12_;
+ const gchar* _tmp10_;
+ gchar* _tmp11_;
#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = resources_RATE_FIVE_PROGRESS;
+ _tmp10_ = resources_RATE_FIVE_PROGRESS;
#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = g_strdup (_tmp11_);
+ _tmp11_ = g_strdup (_tmp10_);
#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp12_;
+ result = _tmp11_;
#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1297 "Resources.c"
+#line 1266 "Resources.c"
}
default:
{
- gchar* _tmp13_;
+ gchar* _tmp12_;
#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
+ _tmp12_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp13_;
+ result = _tmp12_;
#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1308 "Resources.c"
+#line 1277 "Resources.c"
}
}
}
-gchar* resources_get_stars (Rating rating) {
+gchar*
+resources_get_stars (Rating rating)
+{
gchar* result = NULL;
- Rating _tmp0_;
-#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = rating;
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (rating) {
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_ONE:
-#line 1323 "Resources.c"
+#line 1291 "Resources.c"
{
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup ("\xE2\x98\x85");
+ _tmp0_ = g_strdup ("\xE2\x98\x85");
#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1332 "Resources.c"
+#line 1300 "Resources.c"
}
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_TWO:
-#line 1336 "Resources.c"
+#line 1304 "Resources.c"
{
- gchar* _tmp2_;
+ gchar* _tmp1_;
#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
+ _tmp1_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1345 "Resources.c"
+#line 1313 "Resources.c"
}
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_THREE:
-#line 1349 "Resources.c"
+#line 1317 "Resources.c"
{
- gchar* _tmp3_;
+ gchar* _tmp2_;
#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
+ _tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp3_;
+ result = _tmp2_;
#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1358 "Resources.c"
+#line 1326 "Resources.c"
}
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FOUR:
-#line 1362 "Resources.c"
+#line 1330 "Resources.c"
{
- gchar* _tmp4_;
+ gchar* _tmp3_;
#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
+ _tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp4_;
+ result = _tmp3_;
#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1371 "Resources.c"
+#line 1339 "Resources.c"
}
#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FIVE:
-#line 1375 "Resources.c"
+#line 1343 "Resources.c"
{
- gchar* _tmp5_;
+ gchar* _tmp4_;
#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
+ _tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp5_;
+ result = _tmp4_;
#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1384 "Resources.c"
+#line 1352 "Resources.c"
}
default:
{
- gchar* _tmp6_;
+ gchar* _tmp5_;
#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = g_strdup ("");
+ _tmp5_ = g_strdup ("");
#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp6_;
+ result = _tmp5_;
#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1395 "Resources.c"
+#line 1363 "Resources.c"
}
}
}
-GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
+GdkPixbuf*
+resources_get_rating_trinket (Rating rating,
+ gint scale)
+{
GdkPixbuf* result = NULL;
- Rating _tmp0_;
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = rating;
-#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
- switch (_tmp0_) {
+ switch (rating) {
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_REJECTED:
-#line 1410 "Resources.c"
+#line 1378 "Resources.c"
{
- gint _tmp1_;
- GdkPixbuf* _tmp2_;
-#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = scale;
+ GdkPixbuf* _tmp0_;
#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, _tmp1_);
+ _tmp0_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, scale);
#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1422 "Resources.c"
+#line 1387 "Resources.c"
}
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_ONE:
-#line 1426 "Resources.c"
+#line 1391 "Resources.c"
{
- gint _tmp3_;
- GdkPixbuf* _tmp4_;
+ GdkPixbuf* _tmp1_;
#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = scale;
+ _tmp1_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, scale);
#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, _tmp3_);
-#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp4_;
+ result = _tmp1_;
#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1438 "Resources.c"
+#line 1400 "Resources.c"
}
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_TWO:
-#line 1442 "Resources.c"
+#line 1404 "Resources.c"
{
- gint _tmp5_;
- GdkPixbuf* _tmp6_;
-#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = scale;
+ GdkPixbuf* _tmp2_;
#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, _tmp5_ * 2);
+ _tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, scale * 2);
#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp6_;
+ result = _tmp2_;
#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1454 "Resources.c"
+#line 1413 "Resources.c"
}
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_THREE:
-#line 1458 "Resources.c"
+#line 1417 "Resources.c"
{
- gint _tmp7_;
- GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp3_;
#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = scale;
+ _tmp3_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, scale * 3);
#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, _tmp7_ * 3);
-#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp8_;
+ result = _tmp3_;
#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1470 "Resources.c"
+#line 1426 "Resources.c"
}
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FOUR:
-#line 1474 "Resources.c"
+#line 1430 "Resources.c"
{
- gint _tmp9_;
- GdkPixbuf* _tmp10_;
-#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = scale;
+ GdkPixbuf* _tmp4_;
#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, _tmp9_ * 4);
+ _tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, scale * 4);
#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp10_;
+ result = _tmp4_;
#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1486 "Resources.c"
+#line 1439 "Resources.c"
}
#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
case RATING_FIVE:
-#line 1490 "Resources.c"
+#line 1443 "Resources.c"
{
- gint _tmp11_;
- GdkPixbuf* _tmp12_;
-#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = scale;
+ GdkPixbuf* _tmp5_;
#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, _tmp11_ * 5);
+ _tmp5_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, scale * 5);
#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp12_;
+ result = _tmp5_;
#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1502 "Resources.c"
+#line 1452 "Resources.c"
}
default:
{
@@ -1534,13 +1484,15 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
result = NULL;
#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 1510 "Resources.c"
+#line 1460 "Resources.c"
}
}
}
-void resources_generate_rating_strings (void) {
+void
+resources_generate_rating_strings (void)
+{
gchar* menu_base = NULL;
gchar* _tmp0_;
gchar* label_base = NULL;
@@ -2146,30 +2098,31 @@ void resources_generate_rating_strings (void) {
_g_free0 (label_base);
#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (menu_base);
-#line 2122 "Resources.c"
+#line 2074 "Resources.c"
}
-gchar* resources_jump_to_file_failed (GError* err) {
+gchar*
+resources_jump_to_file_failed (GError* err)
+{
gchar* result = NULL;
- GError* _tmp0_;
- const gchar* _tmp1_;
- gchar* _tmp2_;
-#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = err;
+ const gchar* _tmp0_;
+ gchar* _tmp1_;
#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = _tmp0_->message;
+ _tmp0_ = err->message;
#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = g_strdup_printf (_ ("Unable to open in file manager: %s"), _tmp1_);
+ _tmp1_ = g_strdup_printf (_ ("Unable to open in file manager: %s"), _tmp0_);
#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp2_;
+ result = _tmp1_;
#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2141 "Resources.c"
+#line 2092 "Resources.c"
}
-void resources_init (void) {
+void
+resources_init (void)
+{
GtkIconTheme* _tmp0_;
GtkIconTheme* _tmp1_;
#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2180,11 +2133,13 @@ void resources_init (void) {
_g_object_unref0 (_tmp1_);
#line 694 "/home/jens/Source/shotwell/src/Resources.vala"
resources_generate_rating_strings ();
-#line 2156 "Resources.c"
+#line 2109 "Resources.c"
}
-void resources_terminate (void) {
+void
+resources_terminate (void)
+{
}
@@ -2198,7 +2153,9 @@ void resources_terminate (void) {
* and from Marcel Stimberg's original patch to Shotwell to
* try to fix this; both are graciously thanked for their help.
*/
-void resources_fetch_lc_time_format (void) {
+void
+resources_fetch_lc_time_format (void)
+{
gchar* old_language = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
@@ -2232,7 +2189,7 @@ void resources_fetch_lc_time_format (void) {
if (_tmp2_ != NULL) {
#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
g_unsetenv ("LANGUAGE");
-#line 2208 "Resources.c"
+#line 2165 "Resources.c"
}
#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp3_ = setlocale (LC_MESSAGES, NULL);
@@ -2250,13 +2207,13 @@ void resources_fetch_lc_time_format (void) {
_tmp7_ = lc_time;
#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp7_ != NULL) {
-#line 2226 "Resources.c"
+#line 2183 "Resources.c"
const gchar* _tmp8_;
#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp8_ = lc_time;
#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
setlocale (LC_MESSAGES, _tmp8_);
-#line 2232 "Resources.c"
+#line 2189 "Resources.c"
}
#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp9_ = g_strdup ("%X");
@@ -2306,25 +2263,25 @@ void resources_fetch_lc_time_format (void) {
_tmp17_ = old_messages;
#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp17_ != NULL) {
-#line 2282 "Resources.c"
+#line 2239 "Resources.c"
const gchar* _tmp18_;
#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp18_ = old_messages;
#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
setlocale (LC_MESSAGES, _tmp18_);
-#line 2288 "Resources.c"
+#line 2245 "Resources.c"
}
#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp19_ = old_language;
#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp19_ != NULL) {
-#line 2294 "Resources.c"
+#line 2251 "Resources.c"
const gchar* _tmp20_;
#line 767 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp20_ = old_language;
#line 767 "/home/jens/Source/shotwell/src/Resources.vala"
g_setenv ("LANGUAGE", _tmp20_, TRUE);
-#line 2300 "Resources.c"
+#line 2257 "Resources.c"
}
#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (lc_time);
@@ -2332,11 +2289,13 @@ void resources_fetch_lc_time_format (void) {
_g_free0 (old_messages);
#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (old_language);
-#line 2308 "Resources.c"
+#line 2265 "Resources.c"
}
-GType resources_unit_system_get_type (void) {
+GType
+resources_unit_system_get_type (void)
+{
static volatile gsize resources_unit_system_type_id__volatile = 0;
if (g_once_init_enter (&resources_unit_system_type_id__volatile)) {
static const GEnumValue values[] = {{RESOURCES_UNIT_SYSTEM_IMPERIAL, "RESOURCES_UNIT_SYSTEM_IMPERIAL", "imperial"}, {RESOURCES_UNIT_SYSTEM_METRIC, "RESOURCES_UNIT_SYSTEM_METRIC", "metric"}, {RESOURCES_UNIT_SYSTEM_UNKNOWN, "RESOURCES_UNIT_SYSTEM_UNKNOWN", "unknown"}, {0, NULL, NULL}};
@@ -2348,215 +2307,164 @@ GType resources_unit_system_get_type (void) {
}
-static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
+static gint
+string_last_index_of_char (const gchar* self,
+ gunichar c,
+ gint start_index)
+{
gint result = 0;
gchar* _result_ = NULL;
- gint _tmp0_;
- gunichar _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1041 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp0_;
+ gchar* _tmp1_;
+#line 1055 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = start_index;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = c;
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1042 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _result_ = _tmp2_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = _result_;
-#line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ != NULL) {
-#line 2345 "Resources.c"
- gchar* _tmp4_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = _result_;
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = g_utf8_strrchr (((gchar*) self) + start_index, (gssize) -1, c);
+#line 1056 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _result_ = _tmp0_;
+#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = _result_;
+#line 1058 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ != NULL) {
+#line 2302 "Resources.c"
+ gchar* _tmp2_;
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _result_;
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (gint) (_tmp2_ - ((gchar*) self));
+#line 1059 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2353 "Resources.c"
+#line 2310 "Resources.c"
} else {
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
result = -1;
-#line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1061 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2359 "Resources.c"
+#line 2316 "Resources.c"
}
}
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+ glong maxlen)
+{
glong result = 0L;
gchar* end = NULL;
gchar* _tmp0_;
- glong _tmp1_;
- gchar* _tmp2_;
- gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp3_ == NULL) {
-#line 2383 "Resources.c"
- glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2391 "Resources.c"
+#line 2341 "Resources.c"
} else {
- gchar* _tmp5_;
- gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2403 "Resources.c"
+#line 2350 "Resources.c"
}
}
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+ glong offset,
+ glong len)
+{
gchar* result = NULL;
glong string_length = 0L;
gboolean _tmp0_ = FALSE;
- glong _tmp1_;
- glong _tmp8_;
- glong _tmp14_;
- glong _tmp17_;
- glong _tmp18_;
- glong _tmp19_;
- glong _tmp20_;
- glong _tmp21_;
- gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+ glong _tmp6_;
+ gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp1_ >= ((glong) 0)) {
-#line 2427 "Resources.c"
- glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2433 "Resources.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp0_ = len >= ((glong) 0);
+#line 2371 "Resources.c"
} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 2437 "Resources.c"
+#line 2375 "Resources.c"
}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 2441 "Resources.c"
- glong _tmp3_;
- glong _tmp4_;
- glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = _tmp5_;
-#line 2453 "Resources.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = string_strnlen ((gchar*) self, offset + len);
+#line 2381 "Resources.c"
} else {
- gint _tmp6_;
- gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- string_length = (glong) _tmp7_;
-#line 2463 "Resources.c"
+ gint _tmp1_;
+ gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ string_length = (glong) _tmp2_;
+#line 2391 "Resources.c"
}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp8_ < ((glong) 0)) {
-#line 2469 "Resources.c"
- glong _tmp9_;
- glong _tmp10_;
- glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 2483 "Resources.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (offset < ((glong) 0)) {
+#line 2395 "Resources.c"
+ glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 2403 "Resources.c"
} else {
- glong _tmp12_;
- glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 2493 "Resources.c"
+ glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 2410 "Resources.c"
}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- if (_tmp14_ < ((glong) 0)) {
-#line 2499 "Resources.c"
- glong _tmp15_;
- glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- len = _tmp15_ - _tmp16_;
-#line 2508 "Resources.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ if (len < ((glong) 0)) {
+#line 2414 "Resources.c"
+ glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ len = _tmp5_ - offset;
+#line 2420 "Resources.c"
}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
- result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+ result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
return result;
-#line 2528 "Resources.c"
+#line 2432 "Resources.c"
}
-static gboolean _vala_string_array_contains (const gchar* * stack, int stack_length, const gchar* needle) {
+static gboolean
+_vala_string_array_contains (const gchar* * stack,
+ int stack_length,
+ const gchar* needle)
+{
int i;
#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
for (i = 0; i < stack_length; i++) {
@@ -2564,16 +2472,18 @@ static gboolean _vala_string_array_contains (const gchar* * stack, int stack_len
if (g_strcmp0 (stack[i], needle) == 0) {
#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
return TRUE;
-#line 2540 "Resources.c"
+#line 2448 "Resources.c"
}
}
#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
return FALSE;
-#line 2545 "Resources.c"
+#line 2453 "Resources.c"
}
-ResourcesUnitSystem resources_get_default_measurement_unit (void) {
+ResourcesUnitSystem
+resources_get_default_measurement_unit (void)
+{
ResourcesUnitSystem result = 0;
ResourcesUnitSystem _tmp0_;
const gchar* _tmp2_;
@@ -2582,14 +2492,13 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
gint index = 0;
const gchar* _tmp9_;
gint _tmp10_;
- gint _tmp11_;
- const gchar* _tmp15_;
- ResourcesUnitSystem _tmp16_;
+ const gchar* _tmp14_;
+ ResourcesUnitSystem _tmp15_;
#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp0_ = resources_unit_system;
#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) {
-#line 2565 "Resources.c"
+#line 2474 "Resources.c"
ResourcesUnitSystem _tmp1_;
#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_unit_system;
@@ -2597,7 +2506,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
result = _tmp1_;
#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2573 "Resources.c"
+#line 2482 "Resources.c"
}
#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp2_ = g_getenv ("LC_MEASUREMENT");
@@ -2611,7 +2520,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
_tmp4_ = resources_lc_measurement;
#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp4_ == NULL) {
-#line 2587 "Resources.c"
+#line 2496 "Resources.c"
gchar** _tmp5_;
gchar** _tmp6_;
const gchar* _tmp7_;
@@ -2626,51 +2535,49 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
_g_free0 (resources_lc_measurement);
#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
resources_lc_measurement = _tmp8_;
-#line 2602 "Resources.c"
+#line 2511 "Resources.c"
}
#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp9_ = resources_lc_measurement;
#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
- index = _tmp10_;
+ index = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = index;
+ _tmp10_ = index;
#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp11_ > 0) {
-#line 2614 "Resources.c"
- const gchar* _tmp12_;
- gint _tmp13_;
- gchar* _tmp14_;
+ if (_tmp10_ > 0) {
+#line 2521 "Resources.c"
+ const gchar* _tmp11_;
+ gint _tmp12_;
+ gchar* _tmp13_;
#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = resources_lc_measurement;
+ _tmp11_ = resources_lc_measurement;
#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = index;
+ _tmp12_ = index;
#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = string_substring (_tmp12_, (glong) 0, (glong) _tmp13_);
+ _tmp13_ = string_substring (_tmp11_, (glong) 0, (glong) _tmp12_);
#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (resources_lc_measurement);
#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
- resources_lc_measurement = _tmp14_;
-#line 2628 "Resources.c"
+ resources_lc_measurement = _tmp13_;
+#line 2535 "Resources.c"
}
#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC;
#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = resources_lc_measurement;
+ _tmp14_ = resources_lc_measurement;
#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) {
+ if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp14_)) {
#line 799 "/home/jens/Source/shotwell/src/Resources.vala"
resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL;
-#line 2638 "Resources.c"
+#line 2545 "Resources.c"
}
#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = resources_unit_system;
+ _tmp15_ = resources_unit_system;
#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp16_;
+ result = _tmp15_;
#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2646 "Resources.c"
+#line 2553 "Resources.c"
}
@@ -2678,7 +2585,9 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) {
* @brief Returns a precached format string that matches the
* user's LC_TIME settings.
*/
-gchar* resources_get_hh_mm_format_string (void) {
+gchar*
+resources_get_hh_mm_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2689,7 +2598,7 @@ gchar* resources_get_hh_mm_format_string (void) {
if (_tmp0_ == NULL) {
#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2665 "Resources.c"
+#line 2574 "Resources.c"
}
#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_HH_MM_FORMAT_STRING;
@@ -2699,11 +2608,13 @@ gchar* resources_get_hh_mm_format_string (void) {
result = _tmp2_;
#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2675 "Resources.c"
+#line 2584 "Resources.c"
}
-gchar* resources_get_hh_mm_ss_format_string (void) {
+gchar*
+resources_get_hh_mm_ss_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2714,7 +2625,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
if (_tmp0_ == NULL) {
#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2690 "Resources.c"
+#line 2601 "Resources.c"
}
#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
@@ -2724,11 +2635,13 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
result = _tmp2_;
#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2700 "Resources.c"
+#line 2611 "Resources.c"
}
-gchar* resources_get_long_date_format_string (void) {
+gchar*
+resources_get_long_date_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2739,7 +2652,7 @@ gchar* resources_get_long_date_format_string (void) {
if (_tmp0_ == NULL) {
#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2715 "Resources.c"
+#line 2628 "Resources.c"
}
#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
@@ -2749,11 +2662,13 @@ gchar* resources_get_long_date_format_string (void) {
result = _tmp2_;
#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2725 "Resources.c"
+#line 2638 "Resources.c"
}
-gchar* resources_get_start_multiday_span_format_string (void) {
+gchar*
+resources_get_start_multiday_span_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2764,7 +2679,7 @@ gchar* resources_get_start_multiday_span_format_string (void) {
if (_tmp0_ == NULL) {
#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2740 "Resources.c"
+#line 2655 "Resources.c"
}
#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
@@ -2774,11 +2689,13 @@ gchar* resources_get_start_multiday_span_format_string (void) {
result = _tmp2_;
#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2750 "Resources.c"
+#line 2665 "Resources.c"
}
-gchar* resources_get_end_multiday_span_format_string (void) {
+gchar*
+resources_get_end_multiday_span_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2789,7 +2706,7 @@ gchar* resources_get_end_multiday_span_format_string (void) {
if (_tmp0_ == NULL) {
#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2765 "Resources.c"
+#line 2682 "Resources.c"
}
#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
@@ -2799,11 +2716,13 @@ gchar* resources_get_end_multiday_span_format_string (void) {
result = _tmp2_;
#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2775 "Resources.c"
+#line 2692 "Resources.c"
}
-gchar* resources_get_start_multimonth_span_format_string (void) {
+gchar*
+resources_get_start_multimonth_span_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2814,7 +2733,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
if (_tmp0_ == NULL) {
#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2790 "Resources.c"
+#line 2709 "Resources.c"
}
#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2824,11 +2743,13 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
result = _tmp2_;
#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2800 "Resources.c"
+#line 2719 "Resources.c"
}
-gchar* resources_get_end_multimonth_span_format_string (void) {
+gchar*
+resources_get_end_multimonth_span_format_string (void)
+{
gchar* result = NULL;
const gchar* _tmp0_;
const gchar* _tmp1_;
@@ -2839,7 +2760,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
if (_tmp0_ == NULL) {
#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
resources_fetch_lc_time_format ();
-#line 2815 "Resources.c"
+#line 2736 "Resources.c"
}
#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
@@ -2849,36 +2770,39 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
result = _tmp2_;
#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2825 "Resources.c"
+#line 2746 "Resources.c"
}
-gchar* resources_get_ui (const gchar* filename) {
+gchar*
+resources_get_ui (const gchar* filename)
+{
gchar* result = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
+ gchar* _tmp0_;
#line 865 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (filename != NULL, NULL);
#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = filename;
+ _tmp0_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", filename);
#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", _tmp0_);
-#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp1_;
+ result = _tmp0_;
#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2843 "Resources.c"
+#line 2763 "Resources.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
return self ? g_object_ref (self) : NULL;
-#line 2850 "Resources.c"
+#line 2772 "Resources.c"
}
-GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
+GdkPixbuf*
+resources_get_noninterpretable_badge_pixbuf (void)
+{
GdkPixbuf* result = NULL;
GdkPixbuf* _tmp0_;
GdkPixbuf* _tmp7_;
@@ -2888,7 +2812,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
_tmp0_ = resources_noninterpretable_badge_pixbuf;
#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp0_ == NULL) {
-#line 2864 "Resources.c"
+#line 2788 "Resources.c"
{
gchar* path = NULL;
gchar* _tmp1_;
@@ -2910,7 +2834,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (path);
-#line 2886 "Resources.c"
+#line 2810 "Resources.c"
goto __catch438_g_error;
}
#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2925,7 +2849,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
_g_object_unref0 (_tmp2_);
#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (path);
-#line 2901 "Resources.c"
+#line 2825 "Resources.c"
}
goto __finally438;
__catch438_g_error:
@@ -2943,7 +2867,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
"e: %s", _tmp6_);
#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
_g_error_free0 (err);
-#line 2918 "Resources.c"
+#line 2842 "Resources.c"
}
__finally438:
#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2954,7 +2878,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
g_clear_error (&_inner_error_);
#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
return NULL;
-#line 2929 "Resources.c"
+#line 2853 "Resources.c"
}
}
#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -2965,11 +2889,13 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
result = _tmp8_;
#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2940 "Resources.c"
+#line 2864 "Resources.c"
}
-GtkIconTheme* resources_get_icon_theme_engine (void) {
+GtkIconTheme*
+resources_get_icon_theme_engine (void)
+{
GtkIconTheme* result = NULL;
GtkIconTheme* icon_theme = NULL;
GtkIconTheme* _tmp0_;
@@ -2986,276 +2912,245 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
result = icon_theme;
#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 2961 "Resources.c"
+#line 2887 "Resources.c"
}
-GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
+GdkPixbuf*
+resources_get_icon (const gchar* name,
+ gint scale)
+{
GdkPixbuf* result = NULL;
GeeHashMap* _tmp0_;
- GeeHashMap* _tmp10_;
+ GeeHashMap* _tmp7_;
GdkPixbuf* pixbuf = NULL;
- GeeHashMap* _tmp12_;
- const gchar* _tmp13_;
- gpointer _tmp14_;
- GdkPixbuf* _tmp15_;
- gint _tmp22_;
+ GeeHashMap* _tmp9_;
+ gpointer _tmp10_;
+ GdkPixbuf* _tmp11_;
GdkPixbuf* scaled_pixbuf = NULL;
+ GdkPixbuf* _tmp16_;
+ GdkPixbuf* _tmp17_;
+ GeeHashMap* _tmp18_;
+ GeeHashMap* _tmp20_;
+ gchar* _tmp21_;
+ gchar* _tmp22_;
GdkPixbuf* _tmp23_;
- gint _tmp24_;
- GdkPixbuf* _tmp25_;
- GeeHashMap* _tmp26_;
- GeeHashMap* _tmp28_;
- const gchar* _tmp29_;
- gint _tmp30_;
- gchar* _tmp31_;
- gchar* _tmp32_;
- GdkPixbuf* _tmp33_;
#line 894 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp0_ = resources_scaled_icon_cache;
#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp0_ != NULL) {
-#line 2992 "Resources.c"
+#line 2916 "Resources.c"
gchar* scaled_name = NULL;
- const gchar* _tmp1_;
- gint _tmp2_;
- gchar* _tmp3_;
- GeeHashMap* _tmp4_;
- const gchar* _tmp5_;
- gboolean _tmp6_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = name;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = scale;
+ gchar* _tmp1_;
+ GeeHashMap* _tmp2_;
+ const gchar* _tmp3_;
#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_);
+ _tmp1_ = g_strdup_printf ("%s-%d", name, scale);
#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
- scaled_name = _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = resources_scaled_icon_cache;
+ scaled_name = _tmp1_;
#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = scaled_name;
+ _tmp2_ = resources_scaled_icon_cache;
#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
+ _tmp3_ = scaled_name;
#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp6_) {
-#line 3016 "Resources.c"
- GeeHashMap* _tmp7_;
- const gchar* _tmp8_;
- gpointer _tmp9_;
+ if (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_)) {
+#line 2931 "Resources.c"
+ GeeHashMap* _tmp4_;
+ const gchar* _tmp5_;
+ gpointer _tmp6_;
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = resources_scaled_icon_cache;
+ _tmp4_ = resources_scaled_icon_cache;
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = scaled_name;
+ _tmp5_ = scaled_name;
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
+ _tmp6_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
- result = (GdkPixbuf*) _tmp9_;
+ result = (GdkPixbuf*) _tmp6_;
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (scaled_name);
#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3032 "Resources.c"
+#line 2947 "Resources.c"
}
#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (scaled_name);
-#line 3036 "Resources.c"
+#line 2951 "Resources.c"
}
#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = resources_icon_cache;
+ _tmp7_ = resources_icon_cache;
#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp10_ == NULL) {
-#line 3042 "Resources.c"
- GeeHashMap* _tmp11_;
+ if (_tmp7_ == NULL) {
+#line 2957 "Resources.c"
+ GeeHashMap* _tmp8_;
#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (resources_icon_cache);
#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
- resources_icon_cache = _tmp11_;
-#line 3050 "Resources.c"
+ resources_icon_cache = _tmp8_;
+#line 2965 "Resources.c"
}
#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = resources_icon_cache;
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = name;
+ _tmp9_ = resources_icon_cache;
#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
+ _tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name);
#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
- pixbuf = (GdkPixbuf*) _tmp14_;
+ pixbuf = (GdkPixbuf*) _tmp10_;
#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = pixbuf;
+ _tmp11_ = pixbuf;
#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp15_ == NULL) {
-#line 3064 "Resources.c"
- const gchar* _tmp16_;
- GdkPixbuf* _tmp17_;
- GdkPixbuf* _tmp18_;
- GeeHashMap* _tmp19_;
- const gchar* _tmp20_;
- GdkPixbuf* _tmp21_;
-#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = name;
+ if (_tmp11_ == NULL) {
+#line 2977 "Resources.c"
+ GdkPixbuf* _tmp12_;
+ GdkPixbuf* _tmp13_;
+ GeeHashMap* _tmp14_;
+ GdkPixbuf* _tmp15_;
#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp17_ = resources_load_icon (_tmp16_, 0);
+ _tmp12_ = resources_load_icon (name, 0);
#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
- pixbuf = _tmp17_;
+ pixbuf = _tmp12_;
#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp18_ = pixbuf;
+ _tmp13_ = pixbuf;
#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp18_ == NULL) {
+ if (_tmp13_ == NULL) {
#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
result = NULL;
#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3089 "Resources.c"
+#line 2998 "Resources.c"
}
#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp19_ = resources_icon_cache;
-#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp20_ = name;
+ _tmp14_ = resources_icon_cache;
#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp21_ = pixbuf;
+ _tmp15_ = pixbuf;
#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 3099 "Resources.c"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), name, _tmp15_);
+#line 3006 "Resources.c"
}
#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp22_ = scale;
-#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp22_ <= 0) {
+ if (scale <= 0) {
#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
result = pixbuf;
#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3109 "Resources.c"
+#line 3014 "Resources.c"
}
#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp23_ = pixbuf;
+ _tmp16_ = pixbuf;
#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp24_ = scale;
+ _tmp17_ = scale_pixbuf (_tmp16_, scale, GDK_INTERP_BILINEAR, FALSE);
#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
- scaled_pixbuf = _tmp25_;
+ scaled_pixbuf = _tmp17_;
#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp26_ = resources_scaled_icon_cache;
+ _tmp18_ = resources_scaled_icon_cache;
#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp26_ == NULL) {
-#line 3123 "Resources.c"
- GeeHashMap* _tmp27_;
+ if (_tmp18_ == NULL) {
+#line 3026 "Resources.c"
+ GeeHashMap* _tmp19_;
#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp19_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (resources_scaled_icon_cache);
#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
- resources_scaled_icon_cache = _tmp27_;
-#line 3131 "Resources.c"
+ resources_scaled_icon_cache = _tmp19_;
+#line 3034 "Resources.c"
}
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp28_ = resources_scaled_icon_cache;
+ _tmp20_ = resources_scaled_icon_cache;
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp29_ = name;
+ _tmp21_ = g_strdup_printf ("%s-%d", name, scale);
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp30_ = scale;
+ _tmp22_ = _tmp21_;
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_);
-#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp32_ = _tmp31_;
+ _tmp23_ = scaled_pixbuf;
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp33_ = scaled_pixbuf;
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, _tmp23_);
#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, _tmp33_);
-#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp32_);
+ _g_free0 (_tmp22_);
#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
result = scaled_pixbuf;
#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3155 "Resources.c"
+#line 3054 "Resources.c"
}
-GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
+GdkPixbuf*
+resources_load_icon (const gchar* name,
+ gint scale)
+{
GdkPixbuf* result = NULL;
GdkPixbuf* pixbuf = NULL;
- GdkPixbuf* _tmp8_;
- GdkPixbuf* _tmp9_ = NULL;
- gint _tmp10_;
+ GdkPixbuf* _tmp6_;
+ GdkPixbuf* _tmp7_ = NULL;
GError * _inner_error_ = NULL;
#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_val_if_fail (name != NULL, NULL);
#line 930 "/home/jens/Source/shotwell/src/Resources.vala"
pixbuf = NULL;
-#line 3170 "Resources.c"
+#line 3071 "Resources.c"
{
gchar* path = NULL;
- const gchar* _tmp0_;
- gchar* _tmp1_;
- GdkPixbuf* _tmp2_ = NULL;
+ gchar* _tmp0_;
+ GdkPixbuf* _tmp1_ = NULL;
+ GdkPixbuf* _tmp2_;
GdkPixbuf* _tmp3_;
- GdkPixbuf* _tmp4_;
#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp0_ = name;
+ _tmp0_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", name);
#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", _tmp0_);
-#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
- path = _tmp1_;
+ path = _tmp0_;
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = gdk_pixbuf_new_from_resource (path, &_inner_error_);
+ _tmp2_ = gdk_pixbuf_new_from_resource (path, &_inner_error_);
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = _tmp3_;
+ _tmp1_ = _tmp2_;
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (path);
-#line 3192 "Resources.c"
+#line 3090 "Resources.c"
goto __catch439_g_error;
}
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = _tmp2_;
+ _tmp3_ = _tmp1_;
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = NULL;
+ _tmp1_ = NULL;
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
- pixbuf = _tmp4_;
+ pixbuf = _tmp3_;
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp2_);
+ _g_object_unref0 (_tmp1_);
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (path);
-#line 3207 "Resources.c"
+#line 3105 "Resources.c"
}
goto __finally439;
__catch439_g_error:
{
GError* err = NULL;
+ GError* _tmp4_;
const gchar* _tmp5_;
- GError* _tmp6_;
- const gchar* _tmp7_;
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
err = _inner_error_;
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
_inner_error_ = NULL;
#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = name;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = err;
+ _tmp4_ = err;
#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = _tmp6_->message;
+ _tmp5_ = _tmp4_->message;
#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
- g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_);
+ g_critical ("Resources.vala:935: Unable to load icon %s: %s", name, _tmp5_);
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
_g_error_free0 (err);
-#line 3230 "Resources.c"
+#line 3125 "Resources.c"
}
__finally439:
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3268,63 +3163,60 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
g_clear_error (&_inner_error_);
#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
return NULL;
-#line 3243 "Resources.c"
+#line 3138 "Resources.c"
}
#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = pixbuf;
+ _tmp6_ = pixbuf;
#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp8_ == NULL) {
+ if (_tmp6_ == NULL) {
#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
result = NULL;
#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3255 "Resources.c"
+#line 3150 "Resources.c"
}
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = scale;
+ if (scale > 0) {
+#line 3154 "Resources.c"
+ GdkPixbuf* _tmp8_;
+ GdkPixbuf* _tmp9_;
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp10_ > 0) {
-#line 3261 "Resources.c"
- GdkPixbuf* _tmp11_;
- gint _tmp12_;
- GdkPixbuf* _tmp13_;
+ _tmp8_ = pixbuf;
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = pixbuf;
+ _tmp9_ = scale_pixbuf (_tmp8_, scale, GDK_INTERP_BILINEAR, FALSE);
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = scale;
+ _g_object_unref0 (_tmp7_);
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = scale_pixbuf (_tmp11_, _tmp12_, GDK_INTERP_BILINEAR, FALSE);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp9_);
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = _tmp13_;
-#line 3275 "Resources.c"
+ _tmp7_ = _tmp9_;
+#line 3165 "Resources.c"
} else {
- GdkPixbuf* _tmp14_;
- GdkPixbuf* _tmp15_;
+ GdkPixbuf* _tmp10_;
+ GdkPixbuf* _tmp11_;
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = pixbuf;
+ _tmp10_ = pixbuf;
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = _g_object_ref0 (_tmp14_);
+ _tmp11_ = _g_object_ref0 (_tmp10_);
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp9_);
+ _g_object_unref0 (_tmp7_);
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = _tmp15_;
-#line 3287 "Resources.c"
+ _tmp7_ = _tmp11_;
+#line 3177 "Resources.c"
}
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
- result = _tmp9_;
+ result = _tmp7_;
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (pixbuf);
#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3295 "Resources.c"
+#line 3185 "Resources.c"
}
-gchar* resources_get_help_path (void) {
+gchar*
+resources_get_help_path (void)
+{
gchar* result = NULL;
GFile* dir = NULL;
GFile* _tmp0_;
@@ -3332,18 +3224,16 @@ gchar* resources_get_help_path (void) {
gchar* _tmp2_;
gchar* _tmp3_;
gboolean _tmp4_;
- gboolean _tmp5_;
GFile* help_dir = NULL;
+ GFile* _tmp9_;
GFile* _tmp10_;
GFile* _tmp11_;
GFile* _tmp12_;
GFile* _tmp13_;
- GFile* _tmp14_;
GFile* help_index = NULL;
+ GFile* _tmp14_;
GFile* _tmp15_;
GFile* _tmp16_;
- GFile* _tmp17_;
- gboolean _tmp18_;
#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp0_ = app_dirs_get_exec_dir ();
#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3357,90 +3247,83 @@ gchar* resources_get_help_path (void) {
#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp4_ = g_str_has_suffix (_tmp3_, "src");
#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = _tmp4_;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (_tmp3_);
#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp5_) {
-#line 3337 "Resources.c"
+ if (_tmp4_) {
+#line 3225 "Resources.c"
+ GFile* _tmp5_;
GFile* _tmp6_;
GFile* _tmp7_;
GFile* _tmp8_;
- GFile* _tmp9_;
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = dir;
+ _tmp5_ = dir;
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = g_file_get_parent (_tmp6_);
+ _tmp6_ = g_file_get_parent (_tmp5_);
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = _tmp7_;
+ _tmp7_ = _tmp6_;
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = g_file_get_parent (_tmp8_);
+ _tmp8_ = g_file_get_parent (_tmp7_);
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (dir);
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- dir = _tmp9_;
+ dir = _tmp8_;
#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp8_);
-#line 3356 "Resources.c"
+ _g_object_unref0 (_tmp7_);
+#line 3244 "Resources.c"
}
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = dir;
+ _tmp9_ = dir;
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = g_file_get_child (_tmp10_, "help");
+ _tmp10_ = g_file_get_child (_tmp9_, "help");
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = _tmp11_;
+ _tmp11_ = _tmp10_;
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = g_file_get_child (_tmp12_, "C");
+ _tmp12_ = g_file_get_child (_tmp11_, "C");
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = _tmp13_;
+ _tmp13_ = _tmp12_;
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp12_);
+ _g_object_unref0 (_tmp11_);
#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
- help_dir = _tmp14_;
+ help_dir = _tmp13_;
#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = help_dir;
+ _tmp14_ = help_dir;
#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = g_file_get_child (_tmp15_, "index.page");
+ _tmp15_ = g_file_get_child (_tmp14_, "index.page");
#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
- help_index = _tmp16_;
+ help_index = _tmp15_;
#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp17_ = help_index;
+ _tmp16_ = help_index;
#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp18_ = g_file_query_exists (_tmp17_, NULL);
-#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp18_) {
-#line 3384 "Resources.c"
+ if (g_file_query_exists (_tmp16_, NULL)) {
+#line 3270 "Resources.c"
gchar* help_path = NULL;
- GFile* _tmp19_;
- gchar* _tmp20_;
- const gchar* _tmp21_;
- gboolean _tmp22_;
+ GFile* _tmp17_;
+ gchar* _tmp18_;
+ const gchar* _tmp19_;
#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp19_ = help_dir;
+ _tmp17_ = help_dir;
#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp20_ = g_file_get_path (_tmp19_);
+ _tmp18_ = g_file_get_path (_tmp17_);
#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (help_path);
#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
- help_path = _tmp20_;
-#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp21_ = help_path;
+ help_path = _tmp18_;
#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp22_ = g_str_has_suffix (_tmp21_, "/");
+ _tmp19_ = help_path;
#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
- if (!_tmp22_) {
-#line 3404 "Resources.c"
- const gchar* _tmp23_;
- gchar* _tmp24_;
+ if (!g_str_has_suffix (_tmp19_, "/")) {
+#line 3287 "Resources.c"
+ const gchar* _tmp20_;
+ gchar* _tmp21_;
#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp23_ = help_path;
+ _tmp20_ = help_path;
#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp24_ = g_strconcat (_tmp23_, "/", NULL);
+ _tmp21_ = g_strconcat (_tmp20_, "/", NULL);
#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (help_path);
#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
- help_path = _tmp24_;
-#line 3415 "Resources.c"
+ help_path = _tmp21_;
+#line 3298 "Resources.c"
}
#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
result = help_path;
@@ -3452,7 +3335,7 @@ gchar* resources_get_help_path (void) {
_g_object_unref0 (dir);
#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3427 "Resources.c"
+#line 3310 "Resources.c"
}
#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
result = NULL;
@@ -3464,15 +3347,18 @@ gchar* resources_get_help_path (void) {
_g_object_unref0 (dir);
#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3439 "Resources.c"
+#line 3322 "Resources.c"
}
-void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** error) {
+void
+resources_launch_help (GdkScreen* screen,
+ const gchar* anchor,
+ GError** error)
+{
gchar* help_path = NULL;
gchar* _tmp0_;
const gchar* _tmp1_;
- const gchar* _tmp27_;
GError * _inner_error_ = NULL;
#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_if_fail (GDK_IS_SCREEN (screen));
@@ -3484,126 +3370,120 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
_tmp1_ = help_path;
#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp1_ != NULL) {
-#line 3459 "Resources.c"
- const gchar* _tmp2_;
+#line 3345 "Resources.c"
gchar** argv = NULL;
- gchar** _tmp6_;
+ gchar** _tmp4_;
gint argv_length1;
gint _argv_size_;
- gchar** _tmp7_;
- gint _tmp7__length1;
- gchar* _tmp8_;
- gchar* _tmp9_;
- gchar** _tmp10_;
- gint _tmp10__length1;
- const gchar* _tmp11_;
- gchar* _tmp12_;
+ gchar** _tmp5_;
+ gint _tmp5__length1;
+ gchar* _tmp6_;
+ gchar* _tmp7_;
+ gchar** _tmp8_;
+ gint _tmp8__length1;
+ const gchar* _tmp9_;
+ gchar* _tmp10_;
+ gchar* _tmp11_;
+ gchar** _tmp12_;
+ gint _tmp12__length1;
gchar* _tmp13_;
- gchar** _tmp14_;
- gint _tmp14__length1;
- gchar* _tmp15_;
GPid pid = 0;
- gboolean _tmp16_ = FALSE;
- GFile* _tmp17_;
- GFile* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
- gchar** _tmp21_;
- gint _tmp21__length1;
- GPid _tmp22_ = 0;
- gboolean _tmp23_;
- gboolean _tmp24_;
- gchar** _tmp25_;
- gint _tmp25__length1;
- const gchar* _tmp26_;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp2_ = anchor;
+ gboolean _tmp14_ = FALSE;
+ GFile* _tmp15_;
+ GFile* _tmp16_;
+ gchar* _tmp17_;
+ gchar* _tmp18_;
+ gchar** _tmp19_;
+ gint _tmp19__length1;
+ GPid _tmp20_ = 0;
+ gboolean _tmp21_;
+ gboolean _tmp22_;
+ gchar** _tmp23_;
+ gint _tmp23__length1;
+ const gchar* _tmp24_;
#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp2_ != NULL) {
-#line 3495 "Resources.c"
- const gchar* _tmp3_;
- const gchar* _tmp4_;
- gchar* _tmp5_;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = help_path;
+ if (anchor != NULL) {
+#line 3378 "Resources.c"
+ const gchar* _tmp2_;
+ gchar* _tmp3_;
#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = anchor;
+ _tmp2_ = help_path;
#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
+ _tmp3_ = g_strconcat (_tmp2_, anchor, NULL);
#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (help_path);
#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
- help_path = _tmp5_;
-#line 3509 "Resources.c"
+ help_path = _tmp3_;
+#line 3389 "Resources.c"
}
#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = g_new0 (gchar*, 3 + 1);
+ _tmp4_ = g_new0 (gchar*, 3 + 1);
#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
- argv = _tmp6_;
+ argv = _tmp4_;
#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
argv_length1 = 3;
#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
_argv_size_ = argv_length1;
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = argv;
+ _tmp5_ = argv;
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7__length1 = argv_length1;
+ _tmp5__length1 = argv_length1;
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = g_strdup ("yelp");
+ _tmp6_ = g_strdup ("yelp");
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp7_[0]);
+ _g_free0 (_tmp5_[0]);
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_[0] = _tmp8_;
+ _tmp5_[0] = _tmp6_;
#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = _tmp7_[0];
+ _tmp7_ = _tmp5_[0];
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = argv;
+ _tmp8_ = argv;
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10__length1 = argv_length1;
+ _tmp8__length1 = argv_length1;
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = help_path;
+ _tmp9_ = help_path;
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = g_strdup (_tmp11_);
+ _tmp10_ = g_strdup (_tmp9_);
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp10_[1]);
+ _g_free0 (_tmp8_[1]);
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_[1] = _tmp12_;
+ _tmp8_[1] = _tmp10_;
#line 991 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = _tmp10_[1];
+ _tmp11_ = _tmp8_[1];
#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = argv;
+ _tmp12_ = argv;
#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14__length1 = argv_length1;
+ _tmp12__length1 = argv_length1;
#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp14_[2]);
+ _g_free0 (_tmp12_[2]);
#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_[2] = NULL;
+ _tmp12_[2] = NULL;
#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = _tmp14_[2];
+ _tmp13_ = _tmp12_[2];
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp17_ = app_dirs_get_exec_dir ();
+ _tmp15_ = app_dirs_get_exec_dir ();
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp18_ = _tmp17_;
+ _tmp16_ = _tmp15_;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp19_ = g_file_get_path (_tmp18_);
+ _tmp17_ = g_file_get_path (_tmp16_);
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp20_ = _tmp19_;
+ _tmp18_ = _tmp17_;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp21_ = argv;
+ _tmp19_ = argv;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp21__length1 = argv_length1;
+ _tmp19__length1 = argv_length1;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_);
+ _tmp21_ = g_spawn_async (_tmp18_, _tmp19_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp20_, &_inner_error_);
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- pid = _tmp22_;
+ pid = _tmp20_;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp24_ = _tmp23_;
+ _tmp22_ = _tmp21_;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp20_);
+ _g_free0 (_tmp18_);
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp18_);
+ _g_object_unref0 (_tmp16_);
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = _tmp24_;
+ _tmp14_ = _tmp22_;
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3614,51 +3494,43 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
_g_free0 (help_path);
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3589 "Resources.c"
+#line 3469 "Resources.c"
}
#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp16_) {
+ if (_tmp14_) {
#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (help_path);
#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3599 "Resources.c"
+#line 3479 "Resources.c"
}
#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp25_ = argv;
+ _tmp23_ = argv;
#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp25__length1 = argv_length1;
+ _tmp23__length1 = argv_length1;
#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp26_ = _tmp25_[0];
+ _tmp24_ = _tmp23_[0];
#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
- g_warning ("Resources.vala:1000: Unable to launch %s", _tmp26_);
+ g_warning ("Resources.vala:1000: Unable to launch %s", _tmp24_);
#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3611 "Resources.c"
+#line 3491 "Resources.c"
}
#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp27_ = anchor;
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp27_ != NULL) {
-#line 3617 "Resources.c"
- GdkScreen* _tmp28_;
- const gchar* _tmp29_;
- gchar* _tmp30_;
- gchar* _tmp31_;
-#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp28_ = screen;
-#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp29_ = anchor;
+ if (anchor != NULL) {
+#line 3495 "Resources.c"
+ gchar* _tmp25_;
+ gchar* _tmp26_;
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
+ _tmp25_ = g_strconcat ("help:shotwell", anchor, NULL);
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp31_ = _tmp30_;
+ _tmp26_ = _tmp25_;
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
+ sys_show_uri (screen, _tmp26_, &_inner_error_);
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp26_);
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3667,14 +3539,11 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
_g_free0 (help_path);
#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3642 "Resources.c"
+#line 3514 "Resources.c"
}
} else {
- GdkScreen* _tmp32_;
#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp32_ = screen;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
- sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
+ sys_show_uri (screen, "help:shotwell", &_inner_error_);
#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3683,16 +3552,18 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
_g_free0 (help_path);
#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3658 "Resources.c"
+#line 3527 "Resources.c"
}
}
#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
_g_free0 (help_path);
-#line 3663 "Resources.c"
+#line 3532 "Resources.c"
}
-gchar* resources_to_css_color (GdkRGBA* color) {
+gchar*
+resources_to_css_color (GdkRGBA* color)
+{
gchar* result = NULL;
gint r = 0;
GdkRGBA _tmp0_;
@@ -3730,23 +3601,22 @@ gchar* resources_to_css_color (GdkRGBA* color) {
result = _tmp6_;
#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3705 "Resources.c"
+#line 3576 "Resources.c"
}
-void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
+void
+resources_style_widget (GtkWidget* widget,
+ const gchar* stylesheet)
+{
GeeMap* _tmp0_;
GeeMap* _tmp2_;
- GtkWidget* _tmp3_;
- gboolean _tmp4_;
GtkCssProvider* styler = NULL;
- GtkCssProvider* _tmp11_;
- GtkWidget* _tmp17_;
- GtkStyleContext* _tmp18_;
- GtkCssProvider* _tmp19_;
- GeeMap* _tmp20_;
- GtkWidget* _tmp21_;
- GtkCssProvider* _tmp22_;
+ GtkCssProvider* _tmp7_;
+ GtkStyleContext* _tmp11_;
+ GtkCssProvider* _tmp12_;
+ GeeMap* _tmp13_;
+ GtkCssProvider* _tmp14_;
GError * _inner_error_ = NULL;
#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -3756,66 +3626,53 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
_tmp0_ = resources_providers;
#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
if (_tmp0_ == NULL) {
-#line 3731 "Resources.c"
+#line 3601 "Resources.c"
GeeHashMap* _tmp1_;
#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, gtk_css_provider_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (resources_providers);
#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 3739 "Resources.c"
+#line 3609 "Resources.c"
}
#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp2_ = resources_providers;
#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp3_ = widget;
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
- if (_tmp4_) {
-#line 3749 "Resources.c"
- GtkWidget* _tmp5_;
- GtkStyleContext* _tmp6_;
- GeeMap* _tmp7_;
- GtkWidget* _tmp8_;
- gpointer _tmp9_;
- GtkCssProvider* _tmp10_;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp5_ = widget;
+ if (gee_map_has_key (_tmp2_, widget)) {
+#line 3615 "Resources.c"
+ GtkStyleContext* _tmp3_;
+ GeeMap* _tmp4_;
+ gpointer _tmp5_;
+ GtkCssProvider* _tmp6_;
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp6_ = gtk_widget_get_style_context (_tmp5_);
+ _tmp3_ = gtk_widget_get_style_context (widget);
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp7_ = resources_providers;
+ _tmp4_ = resources_providers;
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp8_ = widget;
+ _tmp5_ = gee_map_get (_tmp4_, widget);
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp9_ = gee_map_get (_tmp7_, _tmp8_);
+ _tmp6_ = (GtkCssProvider*) _tmp5_;
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp10_ = (GtkCssProvider*) _tmp9_;
+ gtk_style_context_remove_provider (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_style_provider_get_type (), GtkStyleProvider));
#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider));
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
- _g_object_unref0 (_tmp10_);
-#line 3772 "Resources.c"
+ _g_object_unref0 (_tmp6_);
+#line 3632 "Resources.c"
}
#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp11_ = gtk_css_provider_new ();
+ _tmp7_ = gtk_css_provider_new ();
#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
- styler = _tmp11_;
-#line 3778 "Resources.c"
+ styler = _tmp7_;
+#line 3638 "Resources.c"
{
- GtkCssProvider* _tmp12_;
- const gchar* _tmp13_;
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp12_ = styler;
+ GtkCssProvider* _tmp8_;
#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp13_ = stylesheet;
+ _tmp8_ = styler;
#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
- gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
+ gtk_css_provider_load_from_data (_tmp8_, stylesheet, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3790 "Resources.c"
+#line 3647 "Resources.c"
goto __catch440_g_error;
}
}
@@ -3823,28 +3680,25 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
__catch440_g_error:
{
GError* e = NULL;
- const gchar* _tmp14_;
- GError* _tmp15_;
- const gchar* _tmp16_;
+ GError* _tmp9_;
+ const gchar* _tmp10_;
#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
e = _inner_error_;
#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
_inner_error_ = NULL;
#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp14_ = stylesheet;
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp15_ = e;
+ _tmp9_ = e;
#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp16_ = _tmp15_->message;
+ _tmp10_ = _tmp9_->message;
#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
- g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
+ g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", stylesheet, _tmp10_);
#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
_g_error_free0 (e);
#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (styler);
#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3819 "Resources.c"
+#line 3673 "Resources.c"
}
__finally440:
#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3857,31 +3711,29 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
g_clear_error (&_inner_error_);
#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
return;
-#line 3832 "Resources.c"
+#line 3686 "Resources.c"
}
#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp17_ = widget;
+ _tmp11_ = gtk_widget_get_style_context (widget);
#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp18_ = gtk_widget_get_style_context (_tmp17_);
+ _tmp12_ = styler;
#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp19_ = styler;
-#line 1042 "/home/jens/Source/shotwell/src/Resources.vala"
- gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp20_ = resources_providers;
+ gtk_style_context_add_provider (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_style_provider_get_type (), GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp21_ = widget;
+ _tmp13_ = resources_providers;
#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
- _tmp22_ = styler;
+ _tmp14_ = styler;
#line 1045 "/home/jens/Source/shotwell/src/Resources.vala"
- gee_map_set (_tmp20_, _tmp21_, _tmp22_);
+ gee_map_set (_tmp13_, widget, _tmp14_);
#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
_g_object_unref0 (styler);
-#line 3852 "Resources.c"
+#line 3702 "Resources.c"
}
-gint resources_use_header_bar (void) {
+gint
+resources_use_header_bar (void)
+{
gint result = 0;
const gchar* _tmp0_;
gboolean use_header = FALSE;
@@ -3896,7 +3748,7 @@ gint resources_use_header_bar (void) {
result = 0;
#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3871 "Resources.c"
+#line 3723 "Resources.c"
}
#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp1_ = gtk_settings_get_default ();
@@ -3908,21 +3760,25 @@ gint resources_use_header_bar (void) {
if (_tmp3_) {
#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp2_ = 1;
-#line 3883 "Resources.c"
+#line 3735 "Resources.c"
} else {
#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
_tmp2_ = 0;
-#line 3887 "Resources.c"
+#line 3739 "Resources.c"
}
#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
result = _tmp2_;
#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
return result;
-#line 3893 "Resources.c"
+#line 3745 "Resources.c"
}
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
if ((array != NULL) && (destroy_func != NULL)) {
int i;
for (i = 0; i < array_length; i = i + 1) {
@@ -3934,13 +3790,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
}
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+ gint array_length,
+ GDestroyNotify destroy_func)
+{
_vala_array_destroy (array, array_length, destroy_func);
g_free (array);
}
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
int length;
length = 0;
if (array) {