diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:24:12 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-01-02 11:24:12 +0100 |
| commit | 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (patch) | |
| tree | 8b5b7c598d87518696e151621988eafee18ffa06 /src/Resources.c | |
| parent | 4a3f1fdfe1eb3743564adcee35d5513224339260 (diff) | |
New upstream version 0.25.2upstream/0.25.2
Diffstat (limited to 'src/Resources.c')
| -rw-r--r-- | src/Resources.c | 1861 |
1 files changed, 695 insertions, 1166 deletions
diff --git a/src/Resources.c b/src/Resources.c index a978be8..3a59fbe 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.34.2, the Vala compiler +/* Resources.c generated by valac 0.32.1, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -16,8 +16,8 @@ #include <float.h> #include <math.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <gtk/gtk.h> #include <gee.h> +#include <gtk/gtk.h> #include <gio/gio.h> #include <locale.h> #include <langinfo.h> @@ -30,8 +30,6 @@ #define TYPE_RATING_FILTER (rating_filter_get_type ()) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define _gtk_icon_set_unref0(var) ((var == NULL) ? NULL : (var = (gtk_icon_set_unref (var), NULL))) -#define _gtk_icon_info_free0(var) ((var == NULL) ? NULL : (var = (gtk_icon_info_free (var), NULL))) typedef enum { RATING_REJECTED = -1, @@ -61,7 +59,6 @@ typedef enum { RATING_FILTER_FIVE_ONLY = 14 } RatingFilter; -typedef void (*ResourcesAddStockIconModify) (GdkPixbuf* pixbuf, void* user_data); extern gchar* resources_RATE_ONE_LABEL; extern gchar* resources_RATE_TWO_LABEL; @@ -133,8 +130,6 @@ gchar* resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = NULL; gchar* resources_DISPLAY_FIVE_OR_HIGHER_MENU = NULL; gchar* resources_DISPLAY_FIVE_OR_HIGHER_LABEL = NULL; gchar* resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = NULL; -extern GtkIconFactory* resources_factory; -GtkIconFactory* resources_factory = NULL; extern GeeHashMap* resources_icon_cache; GeeHashMap* resources_icon_cache = NULL; extern GeeHashMap* resources_scaled_icon_cache; @@ -454,10 +449,6 @@ gchar* resources_jump_to_file_failed (GError* err); #define RESOURCES_SELECT_ALL_TOOLTIP _ ("Select all items") void resources_init (void); GFile* app_dirs_get_resources_dir (void); -void resources_add_stock_icon (GFile* file, const gchar* stock_id); -void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar* stock_id, ResourcesAddStockIconModify modify, void* modify_target); -void dim_pixbuf (GdkPixbuf* pixbuf); -static void _dim_pixbuf_resources_add_stock_icon_modify (GdkPixbuf* pixbuf, gpointer self); void resources_terminate (void); void resources_fetch_lc_time_format (void); gchar* resources_get_hh_mm_format_string (void); @@ -514,7 +505,7 @@ gchar* resources_launch_editor_failed (GError* err) { result = _tmp3_; #line 335 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 490 "Resources.c" +#line 481 "Resources.c" } @@ -528,7 +519,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { _tmp0__length1 = names_length1; #line 339 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0__length1 == 1) { -#line 504 "Resources.c" +#line 495 "Resources.c" const gchar* _tmp1_ = NULL; gchar** _tmp2_ = NULL; gint _tmp2__length1 = 0; @@ -559,7 +550,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp7_; #line 340 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 535 "Resources.c" +#line 526 "Resources.c" } else { gchar** _tmp8_ = NULL; gint _tmp8__length1 = 0; @@ -569,7 +560,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { _tmp8__length1 = names_length1; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp8__length1 == 2) { -#line 545 "Resources.c" +#line 536 "Resources.c" const gchar* _tmp9_ = NULL; gchar** _tmp10_ = NULL; gint _tmp10__length1 = 0; @@ -617,7 +608,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp19_; #line 343 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 593 "Resources.c" +#line 584 "Resources.c" } else { const gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; @@ -629,7 +620,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp21_; #line 348 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 605 "Resources.c" +#line 596 "Resources.c" } } } @@ -652,7 +643,7 @@ gchar* resources_delete_tag_menu (const gchar* name) { result = _tmp2_; #line 353 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 628 "Resources.c" +#line 619 "Resources.c" } @@ -673,7 +664,7 @@ gchar* resources_delete_tag_label (const gchar* name) { result = _tmp2_; #line 357 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 649 "Resources.c" +#line 640 "Resources.c" } @@ -694,7 +685,7 @@ gchar* resources_rename_tag_menu (const gchar* name) { result = _tmp2_; #line 366 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 670 "Resources.c" +#line 661 "Resources.c" } @@ -720,7 +711,7 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name) result = _tmp3_; #line 370 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 696 "Resources.c" +#line 687 "Resources.c" } @@ -744,7 +735,7 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) { result = _tmp3_; #line 379 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 720 "Resources.c" +#line 711 "Resources.c" } @@ -768,7 +759,7 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) { result = _tmp3_; #line 385 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 744 "Resources.c" +#line 735 "Resources.c" } @@ -792,7 +783,7 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) { result = _tmp3_; #line 391 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 768 "Resources.c" +#line 759 "Resources.c" } @@ -816,7 +807,7 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) { result = _tmp3_; #line 397 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 792 "Resources.c" +#line 783 "Resources.c" } @@ -837,7 +828,7 @@ gchar* resources_rename_tag_exists_message (const gchar* name) { result = _tmp2_; #line 403 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 813 "Resources.c" +#line 804 "Resources.c" } @@ -858,7 +849,7 @@ gchar* resources_rename_search_exists_message (const gchar* name) { result = _tmp2_; #line 407 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 834 "Resources.c" +#line 825 "Resources.c" } @@ -884,7 +875,7 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na result = _tmp3_; #line 419 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 860 "Resources.c" +#line 851 "Resources.c" } @@ -905,7 +896,7 @@ gchar* resources_delete_search_label (const gchar* name) { result = _tmp2_; #line 423 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 881 "Resources.c" +#line 872 "Resources.c" } @@ -918,27 +909,27 @@ const gchar* resources_rating_label (Rating rating) { switch (_tmp0_) { #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 894 "Resources.c" +#line 885 "Resources.c" { #line 429 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_LABEL; #line 429 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 900 "Resources.c" +#line 891 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 904 "Resources.c" +#line 895 "Resources.c" { #line 431 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_LABEL; #line 431 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 910 "Resources.c" +#line 901 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 914 "Resources.c" +#line 905 "Resources.c" { const gchar* _tmp1_ = NULL; #line 433 "/home/jens/Source/shotwell/src/Resources.vala" @@ -947,11 +938,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp1_; #line 433 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 923 "Resources.c" +#line 914 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 927 "Resources.c" +#line 918 "Resources.c" { const gchar* _tmp2_ = NULL; #line 435 "/home/jens/Source/shotwell/src/Resources.vala" @@ -960,11 +951,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp2_; #line 435 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 936 "Resources.c" +#line 927 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 940 "Resources.c" +#line 931 "Resources.c" { const gchar* _tmp3_ = NULL; #line 437 "/home/jens/Source/shotwell/src/Resources.vala" @@ -973,11 +964,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp3_; #line 437 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 949 "Resources.c" +#line 940 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 953 "Resources.c" +#line 944 "Resources.c" { const gchar* _tmp4_ = NULL; #line 439 "/home/jens/Source/shotwell/src/Resources.vala" @@ -986,11 +977,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp4_; #line 439 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 962 "Resources.c" +#line 953 "Resources.c" } #line 427 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 966 "Resources.c" +#line 957 "Resources.c" { const gchar* _tmp5_ = NULL; #line 441 "/home/jens/Source/shotwell/src/Resources.vala" @@ -999,7 +990,7 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp5_; #line 441 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 975 "Resources.c" +#line 966 "Resources.c" } default: { @@ -1007,7 +998,7 @@ const gchar* resources_rating_label (Rating rating) { result = RESOURCES_RATE_UNRATED_LABEL; #line 443 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 983 "Resources.c" +#line 974 "Resources.c" } } } @@ -1022,27 +1013,27 @@ const gchar* resources_rating_combo_box (Rating rating) { switch (_tmp0_) { #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 998 "Resources.c" +#line 989 "Resources.c" { #line 450 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_COMBO_BOX; #line 450 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1004 "Resources.c" +#line 995 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 1008 "Resources.c" +#line 999 "Resources.c" { #line 452 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_COMBO_BOX; #line 452 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1014 "Resources.c" +#line 1005 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1018 "Resources.c" +#line 1009 "Resources.c" { const gchar* _tmp1_ = NULL; #line 454 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1051,11 +1042,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp1_; #line 454 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1027 "Resources.c" +#line 1018 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1031 "Resources.c" +#line 1022 "Resources.c" { const gchar* _tmp2_ = NULL; #line 456 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1064,11 +1055,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp2_; #line 456 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1040 "Resources.c" +#line 1031 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1044 "Resources.c" +#line 1035 "Resources.c" { const gchar* _tmp3_ = NULL; #line 458 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1077,11 +1068,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp3_; #line 458 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1053 "Resources.c" +#line 1044 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1057 "Resources.c" +#line 1048 "Resources.c" { const gchar* _tmp4_ = NULL; #line 460 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1090,11 +1081,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp4_; #line 460 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1066 "Resources.c" +#line 1057 "Resources.c" } #line 448 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1070 "Resources.c" +#line 1061 "Resources.c" { const gchar* _tmp5_ = NULL; #line 462 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1103,7 +1094,7 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp5_; #line 462 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1079 "Resources.c" +#line 1070 "Resources.c" } default: { @@ -1111,7 +1102,7 @@ const gchar* resources_rating_combo_box (Rating rating) { result = RESOURCES_RATE_UNRATED_MENU; #line 464 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1087 "Resources.c" +#line 1078 "Resources.c" } } } @@ -1126,7 +1117,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { switch (_tmp0_) { #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 1102 "Resources.c" +#line 1093 "Resources.c" { gchar* _tmp1_ = NULL; #line 471 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1135,11 +1126,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp1_; #line 471 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1111 "Resources.c" +#line 1102 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 1115 "Resources.c" +#line 1106 "Resources.c" { const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -1151,11 +1142,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp3_; #line 474 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1127 "Resources.c" +#line 1118 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 1131 "Resources.c" +#line 1122 "Resources.c" { const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -1167,11 +1158,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp5_; #line 477 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1143 "Resources.c" +#line 1134 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 1147 "Resources.c" +#line 1138 "Resources.c" { const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -1183,11 +1174,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp7_; #line 480 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1159 "Resources.c" +#line 1150 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 1163 "Resources.c" +#line 1154 "Resources.c" { const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -1199,13 +1190,13 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp9_; #line 483 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1175 "Resources.c" +#line 1166 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_ONLY: #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 1181 "Resources.c" +#line 1172 "Resources.c" { const gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; @@ -1217,11 +1208,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp11_; #line 487 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1193 "Resources.c" +#line 1184 "Resources.c" } #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_ONLY: -#line 1197 "Resources.c" +#line 1188 "Resources.c" { gchar* _tmp12_ = NULL; #line 490 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1230,12 +1221,12 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp12_; #line 490 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1206 "Resources.c" +#line 1197 "Resources.c" } default: #line 469 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 1211 "Resources.c" +#line 1202 "Resources.c" { gchar* _tmp13_ = NULL; #line 494 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1244,7 +1235,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp13_; #line 494 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1220 "Resources.c" +#line 1211 "Resources.c" } } } @@ -1259,7 +1250,7 @@ gchar* resources_rating_progress (Rating rating) { switch (_tmp0_) { #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1235 "Resources.c" +#line 1226 "Resources.c" { gchar* _tmp1_ = NULL; #line 501 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1268,11 +1259,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp1_; #line 501 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1244 "Resources.c" +#line 1235 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 1248 "Resources.c" +#line 1239 "Resources.c" { gchar* _tmp2_ = NULL; #line 503 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1281,11 +1272,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp2_; #line 503 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1257 "Resources.c" +#line 1248 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1261 "Resources.c" +#line 1252 "Resources.c" { const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -1297,11 +1288,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp4_; #line 505 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1273 "Resources.c" +#line 1264 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1277 "Resources.c" +#line 1268 "Resources.c" { const gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -1313,11 +1304,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp6_; #line 507 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1289 "Resources.c" +#line 1280 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1293 "Resources.c" +#line 1284 "Resources.c" { const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -1329,11 +1320,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp8_; #line 509 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1305 "Resources.c" +#line 1296 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1309 "Resources.c" +#line 1300 "Resources.c" { const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; @@ -1345,11 +1336,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp10_; #line 511 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1321 "Resources.c" +#line 1312 "Resources.c" } #line 499 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1325 "Resources.c" +#line 1316 "Resources.c" { const gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; @@ -1361,7 +1352,7 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp12_; #line 513 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1337 "Resources.c" +#line 1328 "Resources.c" } default: { @@ -1372,7 +1363,7 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp13_; #line 515 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1348 "Resources.c" +#line 1339 "Resources.c" } } } @@ -1387,7 +1378,7 @@ gchar* resources_get_stars (Rating rating) { switch (_tmp0_) { #line 522 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1363 "Resources.c" +#line 1354 "Resources.c" { gchar* _tmp1_ = NULL; #line 524 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1396,11 +1387,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp1_; #line 524 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1372 "Resources.c" +#line 1363 "Resources.c" } #line 522 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1376 "Resources.c" +#line 1367 "Resources.c" { gchar* _tmp2_ = NULL; #line 526 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1409,11 +1400,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp2_; #line 526 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1385 "Resources.c" +#line 1376 "Resources.c" } #line 522 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1389 "Resources.c" +#line 1380 "Resources.c" { gchar* _tmp3_ = NULL; #line 528 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1422,11 +1413,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp3_; #line 528 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1398 "Resources.c" +#line 1389 "Resources.c" } #line 522 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1402 "Resources.c" +#line 1393 "Resources.c" { gchar* _tmp4_ = NULL; #line 530 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1435,11 +1426,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp4_; #line 530 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1411 "Resources.c" +#line 1402 "Resources.c" } #line 522 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1415 "Resources.c" +#line 1406 "Resources.c" { gchar* _tmp5_ = NULL; #line 532 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1448,7 +1439,7 @@ gchar* resources_get_stars (Rating rating) { result = _tmp5_; #line 532 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1424 "Resources.c" +#line 1415 "Resources.c" } default: { @@ -1459,7 +1450,7 @@ gchar* resources_get_stars (Rating rating) { result = _tmp6_; #line 534 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1435 "Resources.c" +#line 1426 "Resources.c" } } } @@ -1474,7 +1465,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { switch (_tmp0_) { #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1450 "Resources.c" +#line 1441 "Resources.c" { gint _tmp1_ = 0; GdkPixbuf* _tmp2_ = NULL; @@ -1486,11 +1477,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp2_; #line 541 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1462 "Resources.c" +#line 1453 "Resources.c" } #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1466 "Resources.c" +#line 1457 "Resources.c" { gint _tmp3_ = 0; GdkPixbuf* _tmp4_ = NULL; @@ -1502,11 +1493,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp4_; #line 544 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1478 "Resources.c" +#line 1469 "Resources.c" } #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1482 "Resources.c" +#line 1473 "Resources.c" { gint _tmp5_ = 0; GdkPixbuf* _tmp6_ = NULL; @@ -1518,11 +1509,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp6_; #line 546 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1494 "Resources.c" +#line 1485 "Resources.c" } #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1498 "Resources.c" +#line 1489 "Resources.c" { gint _tmp7_ = 0; GdkPixbuf* _tmp8_ = NULL; @@ -1534,11 +1525,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp8_; #line 548 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1510 "Resources.c" +#line 1501 "Resources.c" } #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1514 "Resources.c" +#line 1505 "Resources.c" { gint _tmp9_ = 0; GdkPixbuf* _tmp10_ = NULL; @@ -1550,11 +1541,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp10_; #line 550 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1526 "Resources.c" +#line 1517 "Resources.c" } #line 539 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1530 "Resources.c" +#line 1521 "Resources.c" { gint _tmp11_ = 0; GdkPixbuf* _tmp12_ = NULL; @@ -1566,7 +1557,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp12_; #line 552 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1542 "Resources.c" +#line 1533 "Resources.c" } default: { @@ -1574,7 +1565,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = NULL; #line 554 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1550 "Resources.c" +#line 1541 "Resources.c" } } } @@ -2210,7 +2201,7 @@ void resources_generate_rating_strings (void) { _g_free0 (label_base); #line 558 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (menu_base); -#line 2186 "Resources.c" +#line 2177 "Resources.c" } @@ -2232,222 +2223,58 @@ gchar* resources_jump_to_file_failed (GError* err) { result = _tmp3_; #line 669 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2208 "Resources.c" +#line 2199 "Resources.c" } -static void _dim_pixbuf_resources_add_stock_icon_modify (GdkPixbuf* pixbuf, gpointer self) { -#line 710 "/home/jens/Source/shotwell/src/Resources.vala" - dim_pixbuf (pixbuf); -#line 2215 "Resources.c" +static gpointer _g_object_ref0 (gpointer self) { +#line 691 "/home/jens/Source/shotwell/src/Resources.vala" + return self ? g_object_ref (self) : NULL; +#line 2206 "Resources.c" } void resources_init (void) { - GtkIconFactory* _tmp0_ = NULL; - GFile* icons_dir = NULL; - GFile* _tmp1_ = NULL; + GtkIconTheme* icon_theme = NULL; + GtkIconTheme* _tmp0_ = NULL; + GtkIconTheme* _tmp1_ = NULL; GFile* _tmp2_ = NULL; GFile* _tmp3_ = NULL; GFile* _tmp4_ = NULL; GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - GFile* _tmp14_ = NULL; - GFile* _tmp15_ = NULL; - GFile* _tmp16_ = NULL; - GFile* _tmp17_ = NULL; - GFile* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; - GFile* _tmp21_ = NULL; - GFile* _tmp22_ = NULL; - GThemedIcon* _tmp23_ = NULL; - GThemedIcon* _tmp24_ = NULL; - GThemedIcon* _tmp25_ = NULL; - GThemedIcon* _tmp26_ = NULL; - GThemedIcon* _tmp27_ = NULL; - GThemedIcon* _tmp28_ = NULL; - GThemedIcon* _tmp29_ = NULL; - GThemedIcon* _tmp30_ = NULL; - GThemedIcon* _tmp31_ = NULL; - GThemedIcon* _tmp32_ = NULL; - GThemedIcon* _tmp33_ = NULL; - GThemedIcon* _tmp34_ = NULL; - GThemedIcon* _tmp35_ = NULL; - GThemedIcon* _tmp36_ = NULL; - GThemedIcon* _tmp37_ = NULL; - GThemedIcon* _tmp38_ = NULL; - GtkIconFactory* _tmp39_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; +#line 691 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp0_ = gtk_icon_theme_get_default (); +#line 691 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 691 "/home/jens/Source/shotwell/src/Resources.vala" + icon_theme = _tmp1_; #line 693 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = gtk_icon_factory_new (); + _tmp2_ = app_dirs_get_resources_dir (); #line 693 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (resources_factory); + _tmp3_ = _tmp2_; #line 693 "/home/jens/Source/shotwell/src/Resources.vala" - resources_factory = _tmp0_; -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = app_dirs_get_resources_dir (); -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = _tmp1_; -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = g_file_get_child (_tmp2_, "icons"); -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = _tmp3_; -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp2_); -#line 695 "/home/jens/Source/shotwell/src/Resources.vala" - icons_dir = _tmp4_; -#line 696 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_file_get_child (icons_dir, "crop.svg"); -#line 696 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = _tmp5_; -#line 696 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp6_, RESOURCES_CROP); -#line 696 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp6_); -#line 697 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = g_file_get_child (icons_dir, "redeye.png"); -#line 697 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = _tmp7_; -#line 697 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp8_, RESOURCES_REDEYE); -#line 697 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp8_); -#line 698 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = g_file_get_child (icons_dir, "make-primary.svg"); -#line 698 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = _tmp9_; -#line 698 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp10_, RESOURCES_MAKE_PRIMARY); -#line 698 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp10_); -#line 699 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = g_file_get_child (icons_dir, "import.svg"); -#line 699 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = _tmp11_; -#line 699 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp12_, RESOURCES_IMPORT); -#line 699 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp12_); -#line 700 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = g_file_get_child (icons_dir, "straighten.svg"); -#line 700 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = _tmp13_; -#line 700 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp14_, RESOURCES_STRAIGHTEN); -#line 700 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp14_); -#line 701 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = g_file_get_child (icons_dir, "import-all.png"); -#line 701 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = _tmp15_; -#line 701 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp16_, RESOURCES_IMPORT_ALL); -#line 701 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp16_); -#line 702 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = g_file_get_child (icons_dir, "shotwell-auto-enhance.png"); -#line 702 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = _tmp17_; -#line 702 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp18_, RESOURCES_ENHANCE); -#line 702 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp18_); -#line 703 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = g_file_get_child (icons_dir, "crop-pivot-reticle.png"); -#line 703 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = _tmp19_; -#line 703 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp20_, RESOURCES_CROP_PIVOT_RETICLE); -#line 703 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp20_); -#line 704 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = g_file_get_child (icons_dir, "merge.svg"); -#line 704 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp22_ = _tmp21_; -#line 704 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon (_tmp22_, RESOURCES_MERGE); -#line 704 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp22_); -#line 705 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp23_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FLAGGED_PAGE); -#line 705 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp24_ = _tmp23_; -#line 705 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp24_, RESOURCES_ICON_FLAGGED_PAGE, NULL, NULL); -#line 705 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp24_); -#line 706 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp25_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_VIDEOS_PAGE); -#line 706 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp26_ = _tmp25_; -#line 706 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp26_, RESOURCES_ICON_VIDEOS_PAGE, NULL, NULL); -#line 706 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp26_); -#line 707 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp27_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_SINGLE_PHOTO); -#line 707 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp28_ = _tmp27_; -#line 707 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp28_, RESOURCES_ICON_SINGLE_PHOTO, NULL, NULL); -#line 707 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp28_); -#line 708 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp29_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_CAMERAS); -#line 708 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp30_ = _tmp29_; -#line 708 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp30_, RESOURCES_ICON_CAMERAS, NULL, NULL); -#line 708 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp30_); -#line 710 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp31_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_FLAGGED); -#line 710 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp32_ = _tmp31_; -#line 710 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp32_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL); -#line 710 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp32_); -#line 712 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp33_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_PHOTOS); -#line 712 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp34_ = _tmp33_; -#line 712 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp34_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL); -#line 712 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp34_); -#line 714 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp35_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_VIDEOS); -#line 714 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp36_ = _tmp35_; -#line 714 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp36_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL); -#line 714 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp36_); -#line 716 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp37_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_RAW); -#line 716 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp38_ = _tmp37_; -#line 716 "/home/jens/Source/shotwell/src/Resources.vala" - resources_add_stock_icon_from_themed_icon (_tmp38_, RESOURCES_ICON_FILTER_RAW_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL); -#line 716 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp38_); -#line 719 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp39_ = resources_factory; -#line 719 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_icon_factory_add_default (_tmp39_); -#line 721 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp4_ = g_file_get_child (_tmp3_, "icons"); +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp5_ = _tmp4_; +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp6_ = g_file_get_path (_tmp5_); +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp7_ = _tmp6_; +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + gtk_icon_theme_append_search_path (icon_theme, _tmp7_); +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _g_free0 (_tmp7_); +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (_tmp5_); +#line 693 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (_tmp3_); +#line 694 "/home/jens/Source/shotwell/src/Resources.vala" resources_generate_rating_strings (); -#line 691 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (icons_dir); -#line 2423 "Resources.c" +#line 690 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (icon_theme); +#line 2250 "Resources.c" } @@ -2492,129 +2319,129 @@ void resources_fetch_lc_time_format (void) { gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; const gchar* _tmp24_ = NULL; -#line 740 "/home/jens/Source/shotwell/src/Resources.vala" +#line 713 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = g_getenv ("LANGUAGE"); -#line 740 "/home/jens/Source/shotwell/src/Resources.vala" +#line 713 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = g_strdup (_tmp0_); -#line 740 "/home/jens/Source/shotwell/src/Resources.vala" +#line 713 "/home/jens/Source/shotwell/src/Resources.vala" old_language = _tmp1_; -#line 741 "/home/jens/Source/shotwell/src/Resources.vala" +#line 714 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = old_language; -#line 741 "/home/jens/Source/shotwell/src/Resources.vala" +#line 714 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp2_ != NULL) { -#line 742 "/home/jens/Source/shotwell/src/Resources.vala" +#line 715 "/home/jens/Source/shotwell/src/Resources.vala" g_unsetenv ("LANGUAGE"); -#line 2480 "Resources.c" +#line 2307 "Resources.c" } -#line 746 "/home/jens/Source/shotwell/src/Resources.vala" +#line 719 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = setlocale (LC_MESSAGES, NULL); -#line 746 "/home/jens/Source/shotwell/src/Resources.vala" +#line 719 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = g_strdup (_tmp3_); -#line 746 "/home/jens/Source/shotwell/src/Resources.vala" +#line 719 "/home/jens/Source/shotwell/src/Resources.vala" old_messages = _tmp4_; -#line 747 "/home/jens/Source/shotwell/src/Resources.vala" +#line 720 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = setlocale (LC_TIME, NULL); -#line 747 "/home/jens/Source/shotwell/src/Resources.vala" +#line 720 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_strdup (_tmp5_); -#line 747 "/home/jens/Source/shotwell/src/Resources.vala" +#line 720 "/home/jens/Source/shotwell/src/Resources.vala" lc_time = _tmp6_; -#line 749 "/home/jens/Source/shotwell/src/Resources.vala" +#line 722 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = lc_time; -#line 749 "/home/jens/Source/shotwell/src/Resources.vala" +#line 722 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp7_ != NULL) { -#line 2498 "Resources.c" +#line 2325 "Resources.c" const gchar* _tmp8_ = NULL; -#line 750 "/home/jens/Source/shotwell/src/Resources.vala" +#line 723 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = lc_time; -#line 750 "/home/jens/Source/shotwell/src/Resources.vala" +#line 723 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp8_); -#line 2504 "Resources.c" +#line 2331 "Resources.c" } -#line 757 "/home/jens/Source/shotwell/src/Resources.vala" +#line 730 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = g_strdup ("%X"); -#line 757 "/home/jens/Source/shotwell/src/Resources.vala" +#line 730 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_HH_MM_FORMAT_STRING); -#line 757 "/home/jens/Source/shotwell/src/Resources.vala" +#line 730 "/home/jens/Source/shotwell/src/Resources.vala" resources_HH_MM_FORMAT_STRING = _tmp9_; -#line 762 "/home/jens/Source/shotwell/src/Resources.vala" +#line 735 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = nl_langinfo (T_FMT); -#line 762 "/home/jens/Source/shotwell/src/Resources.vala" +#line 735 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = g_strdup (_tmp10_); -#line 762 "/home/jens/Source/shotwell/src/Resources.vala" +#line 735 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_HH_MM_SS_FORMAT_STRING); -#line 762 "/home/jens/Source/shotwell/src/Resources.vala" +#line 735 "/home/jens/Source/shotwell/src/Resources.vala" resources_HH_MM_SS_FORMAT_STRING = _tmp11_; -#line 766 "/home/jens/Source/shotwell/src/Resources.vala" +#line 739 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = _ ("%a %b %d, %Y"); -#line 766 "/home/jens/Source/shotwell/src/Resources.vala" +#line 739 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = g_strdup (_tmp12_); -#line 766 "/home/jens/Source/shotwell/src/Resources.vala" +#line 739 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_LONG_DATE_FORMAT_STRING); -#line 766 "/home/jens/Source/shotwell/src/Resources.vala" +#line 739 "/home/jens/Source/shotwell/src/Resources.vala" resources_LONG_DATE_FORMAT_STRING = _tmp13_; -#line 771 "/home/jens/Source/shotwell/src/Resources.vala" +#line 744 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = C_ ("MultidayFormat", "%a %b %d"); -#line 771 "/home/jens/Source/shotwell/src/Resources.vala" +#line 744 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = g_strdup (_tmp14_); -#line 771 "/home/jens/Source/shotwell/src/Resources.vala" +#line 744 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_START_MULTIDAY_DATE_FORMAT_STRING); -#line 771 "/home/jens/Source/shotwell/src/Resources.vala" +#line 744 "/home/jens/Source/shotwell/src/Resources.vala" resources_START_MULTIDAY_DATE_FORMAT_STRING = _tmp15_; -#line 776 "/home/jens/Source/shotwell/src/Resources.vala" +#line 749 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = C_ ("MultidayFormat", "%d, %Y"); -#line 776 "/home/jens/Source/shotwell/src/Resources.vala" +#line 749 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = g_strdup (_tmp16_); -#line 776 "/home/jens/Source/shotwell/src/Resources.vala" +#line 749 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_END_MULTIDAY_DATE_FORMAT_STRING); -#line 776 "/home/jens/Source/shotwell/src/Resources.vala" +#line 749 "/home/jens/Source/shotwell/src/Resources.vala" resources_END_MULTIDAY_DATE_FORMAT_STRING = _tmp17_; -#line 781 "/home/jens/Source/shotwell/src/Resources.vala" +#line 754 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = C_ ("MultimonthFormat", "%a %b %d"); -#line 781 "/home/jens/Source/shotwell/src/Resources.vala" +#line 754 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = g_strdup (_tmp18_); -#line 781 "/home/jens/Source/shotwell/src/Resources.vala" +#line 754 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_START_MULTIMONTH_DATE_FORMAT_STRING); -#line 781 "/home/jens/Source/shotwell/src/Resources.vala" +#line 754 "/home/jens/Source/shotwell/src/Resources.vala" resources_START_MULTIMONTH_DATE_FORMAT_STRING = _tmp19_; -#line 786 "/home/jens/Source/shotwell/src/Resources.vala" +#line 759 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = C_ ("MultimonthFormat", "%a %b %d, %Y"); -#line 786 "/home/jens/Source/shotwell/src/Resources.vala" +#line 759 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = g_strdup (_tmp20_); -#line 786 "/home/jens/Source/shotwell/src/Resources.vala" +#line 759 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (resources_END_MULTIMONTH_DATE_FORMAT_STRING); -#line 786 "/home/jens/Source/shotwell/src/Resources.vala" +#line 759 "/home/jens/Source/shotwell/src/Resources.vala" resources_END_MULTIMONTH_DATE_FORMAT_STRING = _tmp21_; -#line 789 "/home/jens/Source/shotwell/src/Resources.vala" +#line 762 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = old_messages; -#line 789 "/home/jens/Source/shotwell/src/Resources.vala" +#line 762 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp22_ != NULL) { -#line 2564 "Resources.c" +#line 2391 "Resources.c" const gchar* _tmp23_ = NULL; -#line 790 "/home/jens/Source/shotwell/src/Resources.vala" +#line 763 "/home/jens/Source/shotwell/src/Resources.vala" _tmp23_ = old_messages; -#line 790 "/home/jens/Source/shotwell/src/Resources.vala" +#line 763 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp23_); -#line 2570 "Resources.c" +#line 2397 "Resources.c" } -#line 793 "/home/jens/Source/shotwell/src/Resources.vala" +#line 766 "/home/jens/Source/shotwell/src/Resources.vala" _tmp24_ = old_language; -#line 793 "/home/jens/Source/shotwell/src/Resources.vala" +#line 766 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp24_ != NULL) { -#line 2576 "Resources.c" +#line 2403 "Resources.c" const gchar* _tmp25_ = NULL; -#line 794 "/home/jens/Source/shotwell/src/Resources.vala" +#line 767 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25_ = old_language; -#line 794 "/home/jens/Source/shotwell/src/Resources.vala" +#line 767 "/home/jens/Source/shotwell/src/Resources.vala" g_setenv ("LANGUAGE", _tmp25_, TRUE); -#line 2582 "Resources.c" +#line 2409 "Resources.c" } -#line 737 "/home/jens/Source/shotwell/src/Resources.vala" +#line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (lc_time); -#line 737 "/home/jens/Source/shotwell/src/Resources.vala" +#line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (old_messages); -#line 737 "/home/jens/Source/shotwell/src/Resources.vala" +#line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (old_language); -#line 2590 "Resources.c" +#line 2417 "Resources.c" } @@ -2627,23 +2454,23 @@ gchar* resources_get_hh_mm_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 803 "/home/jens/Source/shotwell/src/Resources.vala" +#line 776 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_HH_MM_FORMAT_STRING; -#line 803 "/home/jens/Source/shotwell/src/Resources.vala" +#line 776 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 804 "/home/jens/Source/shotwell/src/Resources.vala" +#line 777 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2609 "Resources.c" +#line 2436 "Resources.c" } -#line 807 "/home/jens/Source/shotwell/src/Resources.vala" +#line 780 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_FORMAT_STRING; -#line 807 "/home/jens/Source/shotwell/src/Resources.vala" +#line 780 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 807 "/home/jens/Source/shotwell/src/Resources.vala" +#line 780 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 807 "/home/jens/Source/shotwell/src/Resources.vala" +#line 780 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2619 "Resources.c" +#line 2446 "Resources.c" } @@ -2652,23 +2479,23 @@ gchar* resources_get_hh_mm_ss_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 811 "/home/jens/Source/shotwell/src/Resources.vala" +#line 784 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_HH_MM_SS_FORMAT_STRING; -#line 811 "/home/jens/Source/shotwell/src/Resources.vala" +#line 784 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 812 "/home/jens/Source/shotwell/src/Resources.vala" +#line 785 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2634 "Resources.c" +#line 2461 "Resources.c" } -#line 815 "/home/jens/Source/shotwell/src/Resources.vala" +#line 788 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_SS_FORMAT_STRING; -#line 815 "/home/jens/Source/shotwell/src/Resources.vala" +#line 788 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 815 "/home/jens/Source/shotwell/src/Resources.vala" +#line 788 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 815 "/home/jens/Source/shotwell/src/Resources.vala" +#line 788 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2644 "Resources.c" +#line 2471 "Resources.c" } @@ -2677,23 +2504,23 @@ gchar* resources_get_long_date_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 819 "/home/jens/Source/shotwell/src/Resources.vala" +#line 792 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_LONG_DATE_FORMAT_STRING; -#line 819 "/home/jens/Source/shotwell/src/Resources.vala" +#line 792 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 820 "/home/jens/Source/shotwell/src/Resources.vala" +#line 793 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2659 "Resources.c" +#line 2486 "Resources.c" } -#line 823 "/home/jens/Source/shotwell/src/Resources.vala" +#line 796 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_LONG_DATE_FORMAT_STRING; -#line 823 "/home/jens/Source/shotwell/src/Resources.vala" +#line 796 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 823 "/home/jens/Source/shotwell/src/Resources.vala" +#line 796 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 823 "/home/jens/Source/shotwell/src/Resources.vala" +#line 796 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2669 "Resources.c" +#line 2496 "Resources.c" } @@ -2702,23 +2529,23 @@ gchar* resources_get_start_multiday_span_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 827 "/home/jens/Source/shotwell/src/Resources.vala" +#line 800 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING; -#line 827 "/home/jens/Source/shotwell/src/Resources.vala" +#line 800 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 828 "/home/jens/Source/shotwell/src/Resources.vala" +#line 801 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2684 "Resources.c" +#line 2511 "Resources.c" } -#line 831 "/home/jens/Source/shotwell/src/Resources.vala" +#line 804 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING; -#line 831 "/home/jens/Source/shotwell/src/Resources.vala" +#line 804 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 831 "/home/jens/Source/shotwell/src/Resources.vala" +#line 804 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 831 "/home/jens/Source/shotwell/src/Resources.vala" +#line 804 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2694 "Resources.c" +#line 2521 "Resources.c" } @@ -2727,23 +2554,23 @@ gchar* resources_get_end_multiday_span_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 835 "/home/jens/Source/shotwell/src/Resources.vala" +#line 808 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING; -#line 835 "/home/jens/Source/shotwell/src/Resources.vala" +#line 808 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 836 "/home/jens/Source/shotwell/src/Resources.vala" +#line 809 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2709 "Resources.c" +#line 2536 "Resources.c" } -#line 839 "/home/jens/Source/shotwell/src/Resources.vala" +#line 812 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING; -#line 839 "/home/jens/Source/shotwell/src/Resources.vala" +#line 812 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 839 "/home/jens/Source/shotwell/src/Resources.vala" +#line 812 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 839 "/home/jens/Source/shotwell/src/Resources.vala" +#line 812 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2719 "Resources.c" +#line 2546 "Resources.c" } @@ -2752,23 +2579,23 @@ gchar* resources_get_start_multimonth_span_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 843 "/home/jens/Source/shotwell/src/Resources.vala" +#line 816 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING; -#line 843 "/home/jens/Source/shotwell/src/Resources.vala" +#line 816 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 844 "/home/jens/Source/shotwell/src/Resources.vala" +#line 817 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2734 "Resources.c" +#line 2561 "Resources.c" } -#line 847 "/home/jens/Source/shotwell/src/Resources.vala" +#line 820 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING; -#line 847 "/home/jens/Source/shotwell/src/Resources.vala" +#line 820 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 847 "/home/jens/Source/shotwell/src/Resources.vala" +#line 820 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 847 "/home/jens/Source/shotwell/src/Resources.vala" +#line 820 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2744 "Resources.c" +#line 2571 "Resources.c" } @@ -2777,23 +2604,23 @@ gchar* resources_get_end_multimonth_span_format_string (void) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 851 "/home/jens/Source/shotwell/src/Resources.vala" +#line 824 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING; -#line 851 "/home/jens/Source/shotwell/src/Resources.vala" +#line 824 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 852 "/home/jens/Source/shotwell/src/Resources.vala" +#line 825 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2759 "Resources.c" +#line 2586 "Resources.c" } -#line 855 "/home/jens/Source/shotwell/src/Resources.vala" +#line 828 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING; -#line 855 "/home/jens/Source/shotwell/src/Resources.vala" +#line 828 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_strdup (_tmp1_); -#line 855 "/home/jens/Source/shotwell/src/Resources.vala" +#line 828 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp2_; -#line 855 "/home/jens/Source/shotwell/src/Resources.vala" +#line 828 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2769 "Resources.c" +#line 2596 "Resources.c" } @@ -2806,38 +2633,31 @@ GFile* resources_get_ui (const gchar* filename) { const gchar* _tmp4_ = NULL; GFile* _tmp5_ = NULL; GFile* _tmp6_ = NULL; -#line 858 "/home/jens/Source/shotwell/src/Resources.vala" +#line 831 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (filename != NULL, NULL); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = app_dirs_get_resources_dir (); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp0_; -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_file_get_child (_tmp1_, "ui"); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = filename; -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = g_file_get_child (_tmp3_, _tmp4_); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = _tmp5_; -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp3_); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp1_); -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp6_; -#line 859 "/home/jens/Source/shotwell/src/Resources.vala" +#line 832 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2806 "Resources.c" -} - - -static gpointer _g_object_ref0 (gpointer self) { -#line 875 "/home/jens/Source/shotwell/src/Resources.vala" - return self ? g_object_ref (self) : NULL; -#line 2813 "Resources.c" +#line 2633 "Resources.c" } @@ -2847,11 +2667,11 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { GdkPixbuf* _tmp14_ = NULL; GdkPixbuf* _tmp15_ = NULL; GError * _inner_error_ = NULL; -#line 866 "/home/jens/Source/shotwell/src/Resources.vala" +#line 839 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_noninterpretable_badge_pixbuf; -#line 866 "/home/jens/Source/shotwell/src/Resources.vala" +#line 839 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 2827 "Resources.c" +#line 2647 "Resources.c" { GdkPixbuf* _tmp1_ = NULL; GFile* _tmp2_ = NULL; @@ -2865,92 +2685,92 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { GdkPixbuf* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; GdkPixbuf* _tmp12_ = NULL; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = app_dirs_get_resources_dir (); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = g_file_get_child (_tmp3_, "icons"); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp4_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_file_get_child (_tmp5_, RESOURCES_NONINTERPRETABLE_BADGE_FILE); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = _tmp6_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = g_file_get_path (_tmp7_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp8_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = _tmp10_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp9_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp7_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp5_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp3_); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp11_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2873 "Resources.c" +#line 2693 "Resources.c" goto __catch426_g_error; } -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = _tmp1_; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = NULL; -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_noninterpretable_badge_pixbuf); -#line 868 "/home/jens/Source/shotwell/src/Resources.vala" +#line 841 "/home/jens/Source/shotwell/src/Resources.vala" resources_noninterpretable_badge_pixbuf = _tmp12_; -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp1_); -#line 2886 "Resources.c" +#line 2706 "Resources.c" } goto __finally426; __catch426_g_error: { GError* err = NULL; const gchar* _tmp13_ = NULL; -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" err = _inner_error_; -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; -#line 871 "/home/jens/Source/shotwell/src/Resources.vala" +#line 844 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = err->message; -#line 871 "/home/jens/Source/shotwell/src/Resources.vala" - g_error ("Resources.vala:871: VideoReader can't load noninterpretable badge imag" \ +#line 844 "/home/jens/Source/shotwell/src/Resources.vala" + g_error ("Resources.vala:844: VideoReader can't load noninterpretable badge imag" \ "e: %s", _tmp13_); -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 2903 "Resources.c" +#line 2723 "Resources.c" } __finally426: -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" g_clear_error (&_inner_error_); -#line 867 "/home/jens/Source/shotwell/src/Resources.vala" +#line 840 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 2914 "Resources.c" +#line 2734 "Resources.c" } } -#line 875 "/home/jens/Source/shotwell/src/Resources.vala" +#line 848 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = resources_noninterpretable_badge_pixbuf; -#line 875 "/home/jens/Source/shotwell/src/Resources.vala" +#line 848 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = _g_object_ref0 (_tmp14_); -#line 875 "/home/jens/Source/shotwell/src/Resources.vala" +#line 848 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp15_; -#line 875 "/home/jens/Source/shotwell/src/Resources.vala" +#line 848 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2925 "Resources.c" +#line 2745 "Resources.c" } @@ -2965,37 +2785,37 @@ GtkIconTheme* resources_get_icon_theme_engine (void) { GFile* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 879 "/home/jens/Source/shotwell/src/Resources.vala" +#line 852 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = gtk_icon_theme_get_default (); -#line 879 "/home/jens/Source/shotwell/src/Resources.vala" +#line 852 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 879 "/home/jens/Source/shotwell/src/Resources.vala" +#line 852 "/home/jens/Source/shotwell/src/Resources.vala" icon_theme = _tmp1_; -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = app_dirs_get_resources_dir (); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = g_file_get_child (_tmp3_, "icons"); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp4_; -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_file_get_path (_tmp5_); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = _tmp6_; -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" gtk_icon_theme_append_search_path (icon_theme, _tmp7_); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp7_); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp5_); -#line 880 "/home/jens/Source/shotwell/src/Resources.vala" +#line 853 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp3_); -#line 882 "/home/jens/Source/shotwell/src/Resources.vala" +#line 855 "/home/jens/Source/shotwell/src/Resources.vala" result = icon_theme; -#line 882 "/home/jens/Source/shotwell/src/Resources.vala" +#line 855 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2970 "Resources.c" +#line 2790 "Resources.c" } @@ -3020,13 +2840,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { gchar* _tmp31_ = NULL; gchar* _tmp32_ = NULL; GdkPixbuf* _tmp33_ = NULL; -#line 887 "/home/jens/Source/shotwell/src/Resources.vala" +#line 860 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); -#line 888 "/home/jens/Source/shotwell/src/Resources.vala" +#line 861 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_scaled_icon_cache; -#line 888 "/home/jens/Source/shotwell/src/Resources.vala" +#line 861 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ != NULL) { -#line 3001 "Resources.c" +#line 2821 "Resources.c" gchar* scaled_name = NULL; const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; @@ -3034,162 +2854,162 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { GeeHashMap* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 889 "/home/jens/Source/shotwell/src/Resources.vala" +#line 862 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = name; -#line 889 "/home/jens/Source/shotwell/src/Resources.vala" +#line 862 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = scale; -#line 889 "/home/jens/Source/shotwell/src/Resources.vala" +#line 862 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_); -#line 889 "/home/jens/Source/shotwell/src/Resources.vala" +#line 862 "/home/jens/Source/shotwell/src/Resources.vala" scaled_name = _tmp3_; -#line 890 "/home/jens/Source/shotwell/src/Resources.vala" +#line 863 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = resources_scaled_icon_cache; -#line 890 "/home/jens/Source/shotwell/src/Resources.vala" +#line 863 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = scaled_name; -#line 890 "/home/jens/Source/shotwell/src/Resources.vala" +#line 863 "/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_); -#line 890 "/home/jens/Source/shotwell/src/Resources.vala" +#line 863 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp6_) { -#line 3025 "Resources.c" +#line 2845 "Resources.c" GeeHashMap* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gpointer _tmp9_ = NULL; -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = resources_scaled_icon_cache; -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = scaled_name; -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_); -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" result = (GdkPixbuf*) _tmp9_; -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (scaled_name); -#line 891 "/home/jens/Source/shotwell/src/Resources.vala" +#line 864 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3041 "Resources.c" +#line 2861 "Resources.c" } -#line 888 "/home/jens/Source/shotwell/src/Resources.vala" +#line 861 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (scaled_name); -#line 3045 "Resources.c" +#line 2865 "Resources.c" } -#line 896 "/home/jens/Source/shotwell/src/Resources.vala" +#line 869 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = resources_icon_cache; -#line 896 "/home/jens/Source/shotwell/src/Resources.vala" +#line 869 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp10_ == NULL) { -#line 3051 "Resources.c" +#line 2871 "Resources.c" GeeHashMap* _tmp11_ = NULL; -#line 897 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 897 "/home/jens/Source/shotwell/src/Resources.vala" +#line 870 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +#line 870 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_icon_cache); -#line 897 "/home/jens/Source/shotwell/src/Resources.vala" +#line 870 "/home/jens/Source/shotwell/src/Resources.vala" resources_icon_cache = _tmp11_; -#line 3059 "Resources.c" +#line 2879 "Resources.c" } -#line 900 "/home/jens/Source/shotwell/src/Resources.vala" +#line 873 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = resources_icon_cache; -#line 900 "/home/jens/Source/shotwell/src/Resources.vala" +#line 873 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = name; -#line 900 "/home/jens/Source/shotwell/src/Resources.vala" +#line 873 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_); -#line 900 "/home/jens/Source/shotwell/src/Resources.vala" +#line 873 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = (GdkPixbuf*) _tmp14_; -#line 901 "/home/jens/Source/shotwell/src/Resources.vala" +#line 874 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = pixbuf; -#line 901 "/home/jens/Source/shotwell/src/Resources.vala" +#line 874 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp15_ == NULL) { -#line 3073 "Resources.c" +#line 2893 "Resources.c" const gchar* _tmp16_ = NULL; GdkPixbuf* _tmp17_ = NULL; GdkPixbuf* _tmp18_ = NULL; GeeHashMap* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; GdkPixbuf* _tmp21_ = NULL; -#line 902 "/home/jens/Source/shotwell/src/Resources.vala" +#line 875 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = name; -#line 902 "/home/jens/Source/shotwell/src/Resources.vala" +#line 875 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = resources_load_icon (_tmp16_, 0); -#line 902 "/home/jens/Source/shotwell/src/Resources.vala" +#line 875 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 902 "/home/jens/Source/shotwell/src/Resources.vala" +#line 875 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = _tmp17_; -#line 903 "/home/jens/Source/shotwell/src/Resources.vala" +#line 876 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = pixbuf; -#line 903 "/home/jens/Source/shotwell/src/Resources.vala" +#line 876 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp18_ == NULL) { -#line 904 "/home/jens/Source/shotwell/src/Resources.vala" +#line 877 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; -#line 904 "/home/jens/Source/shotwell/src/Resources.vala" +#line 877 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 904 "/home/jens/Source/shotwell/src/Resources.vala" +#line 877 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3098 "Resources.c" +#line 2918 "Resources.c" } -#line 906 "/home/jens/Source/shotwell/src/Resources.vala" +#line 879 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = resources_icon_cache; -#line 906 "/home/jens/Source/shotwell/src/Resources.vala" +#line 879 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = name; -#line 906 "/home/jens/Source/shotwell/src/Resources.vala" +#line 879 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = pixbuf; -#line 906 "/home/jens/Source/shotwell/src/Resources.vala" +#line 879 "/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 3108 "Resources.c" +#line 2928 "Resources.c" } -#line 909 "/home/jens/Source/shotwell/src/Resources.vala" +#line 882 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = scale; -#line 909 "/home/jens/Source/shotwell/src/Resources.vala" +#line 882 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp22_ <= 0) { -#line 910 "/home/jens/Source/shotwell/src/Resources.vala" +#line 883 "/home/jens/Source/shotwell/src/Resources.vala" result = pixbuf; -#line 910 "/home/jens/Source/shotwell/src/Resources.vala" +#line 883 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3118 "Resources.c" +#line 2938 "Resources.c" } -#line 912 "/home/jens/Source/shotwell/src/Resources.vala" +#line 885 "/home/jens/Source/shotwell/src/Resources.vala" _tmp23_ = pixbuf; -#line 912 "/home/jens/Source/shotwell/src/Resources.vala" +#line 885 "/home/jens/Source/shotwell/src/Resources.vala" _tmp24_ = scale; -#line 912 "/home/jens/Source/shotwell/src/Resources.vala" +#line 885 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE); -#line 912 "/home/jens/Source/shotwell/src/Resources.vala" +#line 885 "/home/jens/Source/shotwell/src/Resources.vala" scaled_pixbuf = _tmp25_; -#line 914 "/home/jens/Source/shotwell/src/Resources.vala" +#line 887 "/home/jens/Source/shotwell/src/Resources.vala" _tmp26_ = resources_scaled_icon_cache; -#line 914 "/home/jens/Source/shotwell/src/Resources.vala" +#line 887 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp26_ == NULL) { -#line 3132 "Resources.c" +#line 2952 "Resources.c" GeeHashMap* _tmp27_ = NULL; -#line 915 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 915 "/home/jens/Source/shotwell/src/Resources.vala" +#line 888 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GDK_TYPE_PIXBUF, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +#line 888 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_scaled_icon_cache); -#line 915 "/home/jens/Source/shotwell/src/Resources.vala" +#line 888 "/home/jens/Source/shotwell/src/Resources.vala" resources_scaled_icon_cache = _tmp27_; -#line 3140 "Resources.c" +#line 2960 "Resources.c" } -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp28_ = resources_scaled_icon_cache; -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp29_ = name; -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp30_ = scale; -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_); -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp32_ = _tmp31_; -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _tmp33_ = scaled_pixbuf; -#line 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/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 917 "/home/jens/Source/shotwell/src/Resources.vala" +#line 890 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp32_); -#line 919 "/home/jens/Source/shotwell/src/Resources.vala" +#line 892 "/home/jens/Source/shotwell/src/Resources.vala" result = scaled_pixbuf; -#line 919 "/home/jens/Source/shotwell/src/Resources.vala" +#line 892 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 919 "/home/jens/Source/shotwell/src/Resources.vala" +#line 892 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3164 "Resources.c" +#line 2984 "Resources.c" } @@ -3205,23 +3025,23 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { GdkPixbuf* _tmp17_ = NULL; gint _tmp18_ = 0; GError * _inner_error_ = NULL; -#line 922 "/home/jens/Source/shotwell/src/Resources.vala" +#line 895 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (name != NULL, NULL); -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = app_dirs_get_resources_dir (); -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp0_; -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_file_get_child (_tmp1_, "icons"); -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp1_); -#line 923 "/home/jens/Source/shotwell/src/Resources.vala" +#line 896 "/home/jens/Source/shotwell/src/Resources.vala" icons_dir = _tmp3_; -#line 925 "/home/jens/Source/shotwell/src/Resources.vala" +#line 898 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = NULL; -#line 3196 "Resources.c" +#line 3016 "Resources.c" { GdkPixbuf* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; @@ -3232,42 +3052,42 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { GdkPixbuf* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; GdkPixbuf* _tmp12_ = NULL; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = name; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_file_get_child (icons_dir, _tmp5_); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = _tmp6_; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = g_file_get_path (_tmp7_); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp8_; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = _tmp10_; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp9_); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp7_); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = _tmp11_; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3229 "Resources.c" +#line 3049 "Resources.c" goto __catch427_g_error; } -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = _tmp4_; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = NULL; -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 927 "/home/jens/Source/shotwell/src/Resources.vala" +#line 900 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = _tmp12_; -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp4_); -#line 3242 "Resources.c" +#line 3062 "Resources.c" } goto __finally427; __catch427_g_error: @@ -3276,383 +3096,92 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { const gchar* _tmp13_ = NULL; GError* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" err = _inner_error_; -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; -#line 929 "/home/jens/Source/shotwell/src/Resources.vala" +#line 902 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = name; -#line 929 "/home/jens/Source/shotwell/src/Resources.vala" +#line 902 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = err; -#line 929 "/home/jens/Source/shotwell/src/Resources.vala" +#line 902 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = _tmp14_->message; -#line 929 "/home/jens/Source/shotwell/src/Resources.vala" - g_critical ("Resources.vala:929: Unable to load icon %s: %s", _tmp13_, _tmp15_); -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 902 "/home/jens/Source/shotwell/src/Resources.vala" + g_critical ("Resources.vala:902: Unable to load icon %s: %s", _tmp13_, _tmp15_); +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 3265 "Resources.c" +#line 3085 "Resources.c" } __finally427: -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (icons_dir); -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" g_clear_error (&_inner_error_); -#line 926 "/home/jens/Source/shotwell/src/Resources.vala" +#line 899 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 3280 "Resources.c" +#line 3100 "Resources.c" } -#line 932 "/home/jens/Source/shotwell/src/Resources.vala" +#line 905 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = pixbuf; -#line 932 "/home/jens/Source/shotwell/src/Resources.vala" +#line 905 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp16_ == NULL) { -#line 933 "/home/jens/Source/shotwell/src/Resources.vala" +#line 906 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; -#line 933 "/home/jens/Source/shotwell/src/Resources.vala" +#line 906 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 933 "/home/jens/Source/shotwell/src/Resources.vala" +#line 906 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (icons_dir); -#line 933 "/home/jens/Source/shotwell/src/Resources.vala" +#line 906 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3294 "Resources.c" +#line 3114 "Resources.c" } -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = scale; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp18_ > 0) { -#line 3300 "Resources.c" +#line 3120 "Resources.c" GdkPixbuf* _tmp19_ = NULL; gint _tmp20_ = 0; GdkPixbuf* _tmp21_ = NULL; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = pixbuf; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = scale; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = scale_pixbuf (_tmp19_, _tmp20_, GDK_INTERP_BILINEAR, FALSE); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp17_); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = _tmp21_; -#line 3314 "Resources.c" +#line 3134 "Resources.c" } else { GdkPixbuf* _tmp22_ = NULL; GdkPixbuf* _tmp23_ = NULL; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = pixbuf; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp23_ = _g_object_ref0 (_tmp22_); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp17_); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = _tmp23_; -#line 3326 "Resources.c" +#line 3146 "Resources.c" } -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp17_; -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (pixbuf); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (icons_dir); -#line 935 "/home/jens/Source/shotwell/src/Resources.vala" +#line 908 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3336 "Resources.c" -} - - -void resources_add_stock_icon (GFile* file, const gchar* stock_id) { - GdkPixbuf* pixbuf = NULL; - GtkIconSet* icon_set = NULL; - GdkPixbuf* _tmp10_ = NULL; - GtkIconSet* _tmp11_ = NULL; - GtkIconFactory* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - GError * _inner_error_ = NULL; -#line 938 "/home/jens/Source/shotwell/src/Resources.vala" - g_return_if_fail (G_IS_FILE (file)); -#line 938 "/home/jens/Source/shotwell/src/Resources.vala" - g_return_if_fail (stock_id != NULL); -#line 939 "/home/jens/Source/shotwell/src/Resources.vala" - pixbuf = NULL; -#line 3354 "Resources.c" - { - GdkPixbuf* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = file; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_file_get_path (_tmp1_); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = _tmp2_; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = _tmp4_; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp3_); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = _tmp5_; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3379 "Resources.c" - goto __catch428_g_error; - } -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = _tmp0_; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = NULL; -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (pixbuf); -#line 941 "/home/jens/Source/shotwell/src/Resources.vala" - pixbuf = _tmp6_; -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp0_); -#line 3392 "Resources.c" - } - goto __finally428; - __catch428_g_error: - { - GError* err = NULL; - const gchar* _tmp7_ = NULL; - GError* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - err = _inner_error_; -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - _inner_error_ = NULL; -#line 943 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = stock_id; -#line 943 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = err; -#line 943 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = _tmp8_->message; -#line 943 "/home/jens/Source/shotwell/src/Resources.vala" - g_critical ("Resources.vala:943: Unable to load stock icon %s: %s", _tmp7_, _tmp9_); -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - _g_error_free0 (err); -#line 3415 "Resources.c" - } - __finally428: -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (pixbuf); -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - g_clear_error (&_inner_error_); -#line 940 "/home/jens/Source/shotwell/src/Resources.vala" - return; -#line 3428 "Resources.c" - } -#line 946 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = pixbuf; -#line 946 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gtk_icon_set_new_from_pixbuf (_tmp10_); -#line 946 "/home/jens/Source/shotwell/src/Resources.vala" - icon_set = _tmp11_; -#line 947 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = resources_factory; -#line 947 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = stock_id; -#line 947 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_icon_factory_add (_tmp12_, _tmp13_, icon_set); -#line 938 "/home/jens/Source/shotwell/src/Resources.vala" - _gtk_icon_set_unref0 (icon_set); -#line 938 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (pixbuf); -#line 3446 "Resources.c" -} - - -void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar* stock_id, ResourcesAddStockIconModify modify, void* modify_target) { - GtkIconTheme* icon_theme = NULL; - GtkIconTheme* _tmp0_ = NULL; - GtkIconTheme* _tmp1_ = NULL; - GtkIconTheme* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GtkIconInfo* info = NULL; - GtkIconTheme* _tmp9_ = NULL; - GThemedIcon* _tmp10_ = NULL; - GtkIconInfo* _tmp11_ = NULL; - GtkIconInfo* _tmp12_ = NULL; - GError * _inner_error_ = NULL; -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - g_return_if_fail (G_IS_THEMED_ICON (gicon)); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - g_return_if_fail (stock_id != NULL); -#line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp0_ = gtk_icon_theme_get_default (); -#line 954 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); -#line 954 "/home/jens/Source/shotwell/src/Resources.vala" - icon_theme = _tmp1_; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = icon_theme; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp3_ = app_dirs_get_resources_dir (); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = _tmp3_; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = g_file_get_child (_tmp4_, "icons"); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = _tmp5_; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = g_file_get_path (_tmp6_); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = _tmp7_; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_icon_theme_append_search_path (_tmp2_, _tmp8_); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (_tmp8_); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp6_); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp4_); -#line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = icon_theme; -#line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = gicon; -#line 957 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = gtk_icon_theme_lookup_by_gicon (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_icon_get_type (), GIcon), RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE); -#line 957 "/home/jens/Source/shotwell/src/Resources.vala" - info = _tmp11_; -#line 959 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = info; -#line 959 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp12_ == NULL) { -#line 3511 "Resources.c" - const gchar* _tmp13_ = NULL; -#line 960 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = stock_id; -#line 960 "/home/jens/Source/shotwell/src/Resources.vala" - g_debug ("Resources.vala:960: unable to load icon for: %s", _tmp13_); -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - _gtk_icon_info_free0 (info); -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (icon_theme); -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - return; -#line 3523 "Resources.c" - } - { - GdkPixbuf* pix = NULL; - GtkIconInfo* _tmp14_ = NULL; - GdkPixbuf* _tmp15_ = NULL; - ResourcesAddStockIconModify _tmp16_ = NULL; - void* _tmp16__target = NULL; - GtkIconSet* icon_set = NULL; - GdkPixbuf* _tmp19_ = NULL; - GtkIconSet* _tmp20_ = NULL; - GtkIconFactory* _tmp21_ = NULL; - const gchar* _tmp22_ = NULL; - GtkIconSet* _tmp23_ = NULL; -#line 965 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = info; -#line 965 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = gtk_icon_info_load_icon (_tmp14_, &_inner_error_); -#line 965 "/home/jens/Source/shotwell/src/Resources.vala" - pix = _tmp15_; -#line 965 "/home/jens/Source/shotwell/src/Resources.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3545 "Resources.c" - goto __catch429_g_error; - } -#line 966 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16_ = modify; -#line 966 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp16__target = modify_target; -#line 966 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp16_ != NULL) { -#line 3554 "Resources.c" - ResourcesAddStockIconModify _tmp17_ = NULL; - void* _tmp17__target = NULL; - GdkPixbuf* _tmp18_ = NULL; -#line 967 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ = modify; -#line 967 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17__target = modify_target; -#line 967 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp18_ = pix; -#line 967 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp17_ (_tmp18_, _tmp17__target); -#line 3566 "Resources.c" - } -#line 969 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp19_ = pix; -#line 969 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp20_ = gtk_icon_set_new_from_pixbuf (_tmp19_); -#line 969 "/home/jens/Source/shotwell/src/Resources.vala" - icon_set = _tmp20_; -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp21_ = resources_factory; -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp22_ = stock_id; -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp23_ = icon_set; -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" - gtk_icon_factory_add (_tmp21_, _tmp22_, _tmp23_); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _gtk_icon_set_unref0 (icon_set); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (pix); -#line 3586 "Resources.c" - } - goto __finally429; - __catch429_g_error: - { - GError* err = NULL; - GError* _tmp24_ = NULL; - const gchar* _tmp25_ = NULL; -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - err = _inner_error_; -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _inner_error_ = NULL; -#line 972 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp24_ = err; -#line 972 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp25_ = _tmp24_->message; -#line 972 "/home/jens/Source/shotwell/src/Resources.vala" - g_debug ("Resources.vala:972: %s", _tmp25_); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _g_error_free0 (err); -#line 3606 "Resources.c" - } - __finally429: -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _gtk_icon_info_free0 (info); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (icon_theme); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - g_clear_error (&_inner_error_); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" - return; -#line 3621 "Resources.c" - } -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _gtk_icon_info_free0 (info); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (icon_theme); -#line 3627 "Resources.c" +#line 3156 "Resources.c" } @@ -3670,88 +3199,88 @@ gchar* resources_get_help_path (void) { GFile* _tmp7_ = NULL; GFile* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = app_dirs_get_exec_dir (); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp0_; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_file_get_child (_tmp1_, "help"); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = g_file_get_child (_tmp3_, "C"); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp4_; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp3_); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp1_); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 919 "/home/jens/Source/shotwell/src/Resources.vala" help_dir = _tmp5_; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 920 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = help_dir; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 920 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = g_file_get_child (_tmp6_, "index.page"); -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 920 "/home/jens/Source/shotwell/src/Resources.vala" help_index = _tmp7_; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 922 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = help_index; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 922 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = g_file_query_exists (_tmp8_, NULL); -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 922 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp9_) { -#line 3675 "Resources.c" +#line 3204 "Resources.c" gchar* help_path = NULL; GFile* _tmp10_ = NULL; gchar* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 925 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = help_dir; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 925 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = g_file_get_path (_tmp10_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 925 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 925 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp11_; -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 927 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = help_path; -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 927 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = g_str_has_suffix (_tmp12_, "/"); -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 927 "/home/jens/Source/shotwell/src/Resources.vala" if (!_tmp13_) { -#line 3695 "Resources.c" +#line 3224 "Resources.c" const gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 993 "/home/jens/Source/shotwell/src/Resources.vala" +#line 928 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = help_path; -#line 993 "/home/jens/Source/shotwell/src/Resources.vala" +#line 928 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = g_strconcat (_tmp14_, "/", NULL); -#line 993 "/home/jens/Source/shotwell/src/Resources.vala" +#line 928 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 993 "/home/jens/Source/shotwell/src/Resources.vala" +#line 928 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp15_; -#line 3706 "Resources.c" +#line 3235 "Resources.c" } -#line 996 "/home/jens/Source/shotwell/src/Resources.vala" +#line 931 "/home/jens/Source/shotwell/src/Resources.vala" result = help_path; -#line 996 "/home/jens/Source/shotwell/src/Resources.vala" +#line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_index); -#line 996 "/home/jens/Source/shotwell/src/Resources.vala" +#line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_dir); -#line 996 "/home/jens/Source/shotwell/src/Resources.vala" +#line 931 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3716 "Resources.c" +#line 3245 "Resources.c" } -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 937 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 937 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_index); -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 937 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_dir); -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 937 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3726 "Resources.c" +#line 3255 "Resources.c" } @@ -3761,17 +3290,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err const gchar* _tmp1_ = NULL; const gchar* _tmp27_ = NULL; GError * _inner_error_ = NULL; -#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" +#line 940 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GDK_IS_SCREEN (screen)); -#line 1006 "/home/jens/Source/shotwell/src/Resources.vala" +#line 941 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_get_help_path (); -#line 1006 "/home/jens/Source/shotwell/src/Resources.vala" +#line 941 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp0_; -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 943 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = help_path; -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 943 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp1_ != NULL) { -#line 3746 "Resources.c" +#line 3275 "Resources.c" const gchar* _tmp2_ = NULL; gchar** argv = NULL; gchar** _tmp6_ = NULL; @@ -3803,179 +3332,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; const gchar* _tmp26_ = NULL; -#line 1012 "/home/jens/Source/shotwell/src/Resources.vala" +#line 947 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = anchor; -#line 1012 "/home/jens/Source/shotwell/src/Resources.vala" +#line 947 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp2_ != NULL) { -#line 3782 "Resources.c" +#line 3311 "Resources.c" const gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" +#line 948 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = help_path; -#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" +#line 948 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = anchor; -#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" +#line 948 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL); -#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" +#line 948 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" +#line 948 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp5_; -#line 3796 "Resources.c" +#line 3325 "Resources.c" } -#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_new0 (gchar*, 3 + 1); -#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" argv = _tmp6_; -#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" argv_length1 = 3; -#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" _argv_size_ = argv_length1; -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = argv; -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7__length1 = argv_length1; -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = g_strdup ("yelp"); -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp7_[0]); -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_[0] = _tmp8_; -#line 1017 "/home/jens/Source/shotwell/src/Resources.vala" +#line 952 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp7_[0]; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = argv; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10__length1 = argv_length1; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = help_path; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = g_strdup (_tmp11_); -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp10_[1]); -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_[1] = _tmp12_; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = _tmp10_[1]; -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = argv; -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14__length1 = argv_length1; -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp14_[2]); -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_[2] = NULL; -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = _tmp14_[2]; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = app_dirs_get_exec_dir (); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = _tmp17_; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = g_file_get_path (_tmp18_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = _tmp19_; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = argv; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21__length1 = argv_length1; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/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_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" pid = _tmp22_; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp24_ = _tmp23_; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp20_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp18_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = _tmp24_; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3876 "Resources.c" +#line 3405 "Resources.c" } -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp16_) { -#line 1024 "/home/jens/Source/shotwell/src/Resources.vala" +#line 959 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 1024 "/home/jens/Source/shotwell/src/Resources.vala" +#line 959 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1024 "/home/jens/Source/shotwell/src/Resources.vala" +#line 959 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3886 "Resources.c" +#line 3415 "Resources.c" } -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 962 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25_ = argv; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 962 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25__length1 = argv_length1; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 962 "/home/jens/Source/shotwell/src/Resources.vala" _tmp26_ = _tmp25_[0]; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:1027: Unable to launch %s", _tmp26_); -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 962 "/home/jens/Source/shotwell/src/Resources.vala" + g_warning ("Resources.vala:962: Unable to launch %s", _tmp26_); +#line 943 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3898 "Resources.c" +#line 3427 "Resources.c" } -#line 1031 "/home/jens/Source/shotwell/src/Resources.vala" +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" _tmp27_ = anchor; -#line 1031 "/home/jens/Source/shotwell/src/Resources.vala" +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp27_ != NULL) { -#line 3904 "Resources.c" +#line 3433 "Resources.c" GdkScreen* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _tmp28_ = screen; -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _tmp29_ = anchor; -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL); -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _tmp31_ = _tmp30_; -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" sys_show_uri (_tmp28_, _tmp31_, &_inner_error_); -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp31_); -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" +#line 967 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3929 "Resources.c" +#line 3458 "Resources.c" } } else { GdkScreen* _tmp32_ = NULL; -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" _tmp32_ = screen; -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3945 "Resources.c" +#line 3474 "Resources.c" } } -#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" +#line 940 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 3950 "Resources.c" +#line 3479 "Resources.c" } @@ -3991,33 +3520,33 @@ gchar* resources_to_css_color (GdkRGBA* color) { GdkRGBA _tmp4_ = {0}; gdouble _tmp5_ = 0.0; gchar* _tmp6_ = NULL; -#line 1038 "/home/jens/Source/shotwell/src/Resources.vala" +#line 973 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (color != NULL, NULL); -#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" +#line 974 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = *color; -#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" +#line 974 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp0_.red; -#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" +#line 974 "/home/jens/Source/shotwell/src/Resources.vala" r = (gint) (_tmp1_ * 255); -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = *color; -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_.green; -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" g = (gint) (_tmp3_ * 255); -#line 1041 "/home/jens/Source/shotwell/src/Resources.vala" +#line 976 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = *color; -#line 1041 "/home/jens/Source/shotwell/src/Resources.vala" +#line 976 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp4_.blue; -#line 1041 "/home/jens/Source/shotwell/src/Resources.vala" +#line 976 "/home/jens/Source/shotwell/src/Resources.vala" b = (gint) (_tmp5_ * 255); -#line 1043 "/home/jens/Source/shotwell/src/Resources.vala" +#line 978 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b); -#line 1043 "/home/jens/Source/shotwell/src/Resources.vala" +#line 978 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp6_; -#line 1043 "/home/jens/Source/shotwell/src/Resources.vala" +#line 978 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3992 "Resources.c" +#line 3521 "Resources.c" } @@ -4035,136 +3564,136 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { GtkWidget* _tmp21_ = NULL; GtkCssProvider* _tmp22_ = NULL; GError * _inner_error_ = NULL; -#line 1050 "/home/jens/Source/shotwell/src/Resources.vala" +#line 985 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); -#line 1050 "/home/jens/Source/shotwell/src/Resources.vala" +#line 985 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (stylesheet != NULL); -#line 1051 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_providers; -#line 1051 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 4018 "Resources.c" +#line 3547 "Resources.c" GeeHashMap* _tmp1_ = NULL; -#line 1052 "/home/jens/Source/shotwell/src/Resources.vala" +#line 987 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 1052 "/home/jens/Source/shotwell/src/Resources.vala" +#line 987 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_providers); -#line 1052 "/home/jens/Source/shotwell/src/Resources.vala" +#line 987 "/home/jens/Source/shotwell/src/Resources.vala" resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap); -#line 4026 "Resources.c" +#line 3555 "Resources.c" } -#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = resources_providers; -#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = widget; -#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = gee_map_has_key (_tmp2_, _tmp3_); -#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp4_) { -#line 4036 "Resources.c" +#line 3565 "Resources.c" GtkWidget* _tmp5_ = NULL; GtkStyleContext* _tmp6_ = NULL; GeeMap* _tmp7_ = NULL; GtkWidget* _tmp8_ = NULL; gpointer _tmp9_ = NULL; GtkCssProvider* _tmp10_ = NULL; -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = widget; -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = gtk_widget_get_style_context (_tmp5_); -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = resources_providers; -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = widget; -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = gee_map_get (_tmp7_, _tmp8_); -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = (GtkCssProvider*) _tmp9_; -#line 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/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 1055 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp10_); -#line 4059 "Resources.c" +#line 3588 "Resources.c" } -#line 1057 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = gtk_css_provider_new (); -#line 1057 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" styler = _tmp11_; -#line 4065 "Resources.c" +#line 3594 "Resources.c" { GtkCssProvider* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; -#line 1060 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = styler; -#line 1060 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = stylesheet; -#line 1060 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_); -#line 1060 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4077 "Resources.c" - goto __catch430_g_error; +#line 3606 "Resources.c" + goto __catch428_g_error; } } - goto __finally430; - __catch430_g_error: + goto __finally428; + __catch428_g_error: { GError* e = NULL; const gchar* _tmp14_ = NULL; GError* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" e = _inner_error_; -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; -#line 1062 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = stylesheet; -#line 1062 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = e; -#line 1062 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = _tmp15_->message; -#line 1062 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:1062: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_); -#line 1066 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" + g_warning ("Resources.vala:997: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_); +#line 1001 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (e); -#line 1066 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1001 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 1066 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1001 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 4106 "Resources.c" +#line 3635 "Resources.c" } - __finally430: -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" + __finally428: +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" g_clear_error (&_inner_error_); -#line 1059 "/home/jens/Source/shotwell/src/Resources.vala" +#line 994 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 4119 "Resources.c" +#line 3648 "Resources.c" } -#line 1069 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = widget; -#line 1069 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = gtk_widget_get_style_context (_tmp17_); -#line 1069 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = styler; -#line 1069 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/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 1072 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = resources_providers; -#line 1072 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = widget; -#line 1072 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = styler; -#line 1072 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" gee_map_set (_tmp20_, _tmp21_, _tmp22_); -#line 1050 "/home/jens/Source/shotwell/src/Resources.vala" +#line 985 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 4139 "Resources.c" +#line 3668 "Resources.c" } |