diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
commit | e230b6f78546827521107be23797048482c8b193 (patch) | |
tree | 948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/Resources.c | |
parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
parent | 49120f48474fc8fdc2448c75d961bc238213cfac (diff) |
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/Resources.c')
-rw-r--r-- | src/Resources.c | 951 |
1 files changed, 519 insertions, 432 deletions
diff --git a/src/Resources.c b/src/Resources.c index 0c894c6..da32009 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -221,7 +221,7 @@ GeeMap* resources_providers = NULL; #define RESOURCES_MERGE "shotwell-merge-events" #define RESOURCES_GO_NEXT "go-next" #define RESOURCES_GO_PREVIOUS "go-previous" -#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.jpg" +#define RESOURCES_ICON_ABOUT_LOGO "about-braunschweig.jpg" #define RESOURCES_ICON_GENERIC_PLUGIN "generic-plugin.png" #define RESOURCES_ICON_SLIDESHOW_EXTENSION_POINT "slideshow-extension-point" #define RESOURCES_ICON_RATING_REJECTED "rejected.svg" @@ -485,6 +485,7 @@ void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error); gchar* resources_to_css_color (GdkRGBA* color); #define RESOURCES_ALL_DATA -1 void resources_style_widget (GtkWidget* widget, const gchar* stylesheet); +gint resources_use_header_bar (void); #define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \ " background-color: @borders;\n" \ " }\n" \ @@ -518,7 +519,7 @@ gchar* resources_launch_editor_failed (GError* err) { result = _tmp2_; #line 336 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 494 "Resources.c" +#line 495 "Resources.c" } @@ -532,7 +533,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { _tmp0__length1 = names_length1; #line 340 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0__length1 == 1) { -#line 508 "Resources.c" +#line 509 "Resources.c" gchar** _tmp1_; gint _tmp1__length1; const gchar* _tmp2_; @@ -560,7 +561,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp6_; #line 341 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 536 "Resources.c" +#line 537 "Resources.c" } else { gchar** _tmp7_; gint _tmp7__length1; @@ -570,7 +571,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { _tmp7__length1 = names_length1; #line 342 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp7__length1 == 2) { -#line 546 "Resources.c" +#line 547 "Resources.c" gchar** _tmp8_; gint _tmp8__length1; const gchar* _tmp9_; @@ -615,7 +616,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp17_; #line 344 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 591 "Resources.c" +#line 592 "Resources.c" } else { gchar* _tmp18_; #line 349 "/home/jens/Source/shotwell/src/Resources.vala" @@ -624,7 +625,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) { result = _tmp18_; #line 349 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 600 "Resources.c" +#line 601 "Resources.c" } } } @@ -644,7 +645,7 @@ gchar* resources_delete_tag_menu (const gchar* name) { result = _tmp1_; #line 354 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 620 "Resources.c" +#line 621 "Resources.c" } @@ -662,7 +663,7 @@ gchar* resources_delete_tag_label (const gchar* name) { result = _tmp1_; #line 358 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 638 "Resources.c" +#line 639 "Resources.c" } @@ -680,7 +681,7 @@ gchar* resources_rename_tag_menu (const gchar* name) { result = _tmp1_; #line 367 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 656 "Resources.c" +#line 657 "Resources.c" } @@ -703,7 +704,7 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name) result = _tmp2_; #line 371 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 679 "Resources.c" +#line 680 "Resources.c" } @@ -724,7 +725,7 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) { result = _tmp2_; #line 380 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 700 "Resources.c" +#line 701 "Resources.c" } @@ -745,7 +746,7 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) { result = _tmp2_; #line 386 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 721 "Resources.c" +#line 722 "Resources.c" } @@ -766,7 +767,7 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) { result = _tmp2_; #line 392 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 742 "Resources.c" +#line 743 "Resources.c" } @@ -787,7 +788,7 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) { result = _tmp2_; #line 398 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 763 "Resources.c" +#line 764 "Resources.c" } @@ -805,7 +806,7 @@ gchar* resources_rename_tag_exists_message (const gchar* name) { result = _tmp1_; #line 404 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 781 "Resources.c" +#line 782 "Resources.c" } @@ -823,7 +824,7 @@ gchar* resources_rename_search_exists_message (const gchar* name) { result = _tmp1_; #line 408 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 799 "Resources.c" +#line 800 "Resources.c" } @@ -846,7 +847,7 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na result = _tmp2_; #line 420 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 822 "Resources.c" +#line 823 "Resources.c" } @@ -864,7 +865,7 @@ gchar* resources_delete_search_label (const gchar* name) { result = _tmp1_; #line 424 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 840 "Resources.c" +#line 841 "Resources.c" } @@ -877,27 +878,27 @@ const gchar* resources_rating_label (Rating rating) { switch (_tmp0_) { #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 853 "Resources.c" +#line 854 "Resources.c" { #line 430 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_LABEL; #line 430 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 859 "Resources.c" +#line 860 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 863 "Resources.c" +#line 864 "Resources.c" { #line 432 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_LABEL; #line 432 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 869 "Resources.c" +#line 870 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 873 "Resources.c" +#line 874 "Resources.c" { const gchar* _tmp1_; #line 434 "/home/jens/Source/shotwell/src/Resources.vala" @@ -906,11 +907,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp1_; #line 434 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 882 "Resources.c" +#line 883 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 886 "Resources.c" +#line 887 "Resources.c" { const gchar* _tmp2_; #line 436 "/home/jens/Source/shotwell/src/Resources.vala" @@ -919,11 +920,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp2_; #line 436 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 895 "Resources.c" +#line 896 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 899 "Resources.c" +#line 900 "Resources.c" { const gchar* _tmp3_; #line 438 "/home/jens/Source/shotwell/src/Resources.vala" @@ -932,11 +933,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp3_; #line 438 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 908 "Resources.c" +#line 909 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 912 "Resources.c" +#line 913 "Resources.c" { const gchar* _tmp4_; #line 440 "/home/jens/Source/shotwell/src/Resources.vala" @@ -945,11 +946,11 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp4_; #line 440 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 921 "Resources.c" +#line 922 "Resources.c" } #line 428 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 925 "Resources.c" +#line 926 "Resources.c" { const gchar* _tmp5_; #line 442 "/home/jens/Source/shotwell/src/Resources.vala" @@ -958,7 +959,7 @@ const gchar* resources_rating_label (Rating rating) { result = _tmp5_; #line 442 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 934 "Resources.c" +#line 935 "Resources.c" } default: { @@ -966,7 +967,7 @@ const gchar* resources_rating_label (Rating rating) { result = RESOURCES_RATE_UNRATED_LABEL; #line 444 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 942 "Resources.c" +#line 943 "Resources.c" } } } @@ -981,27 +982,27 @@ const gchar* resources_rating_combo_box (Rating rating) { switch (_tmp0_) { #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 957 "Resources.c" +#line 958 "Resources.c" { #line 451 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_REJECTED_COMBO_BOX; #line 451 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 963 "Resources.c" +#line 964 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 967 "Resources.c" +#line 968 "Resources.c" { #line 453 "/home/jens/Source/shotwell/src/Resources.vala" result = RESOURCES_RATE_UNRATED_COMBO_BOX; #line 453 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 973 "Resources.c" +#line 974 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 977 "Resources.c" +#line 978 "Resources.c" { const gchar* _tmp1_; #line 455 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1010,11 +1011,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp1_; #line 455 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 986 "Resources.c" +#line 987 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 990 "Resources.c" +#line 991 "Resources.c" { const gchar* _tmp2_; #line 457 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1023,11 +1024,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp2_; #line 457 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 999 "Resources.c" +#line 1000 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1003 "Resources.c" +#line 1004 "Resources.c" { const gchar* _tmp3_; #line 459 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1036,11 +1037,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp3_; #line 459 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1012 "Resources.c" +#line 1013 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1016 "Resources.c" +#line 1017 "Resources.c" { const gchar* _tmp4_; #line 461 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1049,11 +1050,11 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp4_; #line 461 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1025 "Resources.c" +#line 1026 "Resources.c" } #line 449 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1029 "Resources.c" +#line 1030 "Resources.c" { const gchar* _tmp5_; #line 463 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1062,7 +1063,7 @@ const gchar* resources_rating_combo_box (Rating rating) { result = _tmp5_; #line 463 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1038 "Resources.c" +#line 1039 "Resources.c" } default: { @@ -1070,7 +1071,7 @@ const gchar* resources_rating_combo_box (Rating rating) { result = RESOURCES_RATE_UNRATED_MENU; #line 465 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1046 "Resources.c" +#line 1047 "Resources.c" } } } @@ -1085,7 +1086,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { switch (_tmp0_) { #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_OR_HIGHER: -#line 1061 "Resources.c" +#line 1062 "Resources.c" { gchar* _tmp1_; #line 472 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1094,11 +1095,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp1_; #line 472 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1070 "Resources.c" +#line 1071 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_ONE_OR_HIGHER: -#line 1074 "Resources.c" +#line 1075 "Resources.c" { const gchar* _tmp2_; gchar* _tmp3_; @@ -1110,11 +1111,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp3_; #line 475 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1086 "Resources.c" +#line 1087 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_TWO_OR_HIGHER: -#line 1090 "Resources.c" +#line 1091 "Resources.c" { const gchar* _tmp4_; gchar* _tmp5_; @@ -1126,11 +1127,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp5_; #line 478 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1102 "Resources.c" +#line 1103 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_THREE_OR_HIGHER: -#line 1106 "Resources.c" +#line 1107 "Resources.c" { const gchar* _tmp6_; gchar* _tmp7_; @@ -1142,11 +1143,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp7_; #line 481 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1118 "Resources.c" +#line 1119 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FOUR_OR_HIGHER: -#line 1122 "Resources.c" +#line 1123 "Resources.c" { const gchar* _tmp8_; gchar* _tmp9_; @@ -1158,13 +1159,13 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp9_; #line 484 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1134 "Resources.c" +#line 1135 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_ONLY: #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_FIVE_OR_HIGHER: -#line 1140 "Resources.c" +#line 1141 "Resources.c" { const gchar* _tmp10_; gchar* _tmp11_; @@ -1176,11 +1177,11 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp11_; #line 488 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1152 "Resources.c" +#line 1153 "Resources.c" } #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_REJECTED_ONLY: -#line 1156 "Resources.c" +#line 1157 "Resources.c" { gchar* _tmp12_; #line 491 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1189,12 +1190,12 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp12_; #line 491 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1165 "Resources.c" +#line 1166 "Resources.c" } default: #line 470 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FILTER_UNRATED_OR_HIGHER: -#line 1170 "Resources.c" +#line 1171 "Resources.c" { gchar* _tmp13_; #line 495 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1203,7 +1204,7 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) { result = _tmp13_; #line 495 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1179 "Resources.c" +#line 1180 "Resources.c" } } } @@ -1218,7 +1219,7 @@ gchar* resources_rating_progress (Rating rating) { switch (_tmp0_) { #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1194 "Resources.c" +#line 1195 "Resources.c" { gchar* _tmp1_; #line 502 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1227,11 +1228,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp1_; #line 502 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1203 "Resources.c" +#line 1204 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_UNRATED: -#line 1207 "Resources.c" +#line 1208 "Resources.c" { gchar* _tmp2_; #line 504 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1240,11 +1241,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp2_; #line 504 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1216 "Resources.c" +#line 1217 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1220 "Resources.c" +#line 1221 "Resources.c" { const gchar* _tmp3_; gchar* _tmp4_; @@ -1256,11 +1257,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp4_; #line 506 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1232 "Resources.c" +#line 1233 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1236 "Resources.c" +#line 1237 "Resources.c" { const gchar* _tmp5_; gchar* _tmp6_; @@ -1272,11 +1273,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp6_; #line 508 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1248 "Resources.c" +#line 1249 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1252 "Resources.c" +#line 1253 "Resources.c" { const gchar* _tmp7_; gchar* _tmp8_; @@ -1288,11 +1289,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp8_; #line 510 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1264 "Resources.c" +#line 1265 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1268 "Resources.c" +#line 1269 "Resources.c" { const gchar* _tmp9_; gchar* _tmp10_; @@ -1304,11 +1305,11 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp10_; #line 512 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1280 "Resources.c" +#line 1281 "Resources.c" } #line 500 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1284 "Resources.c" +#line 1285 "Resources.c" { const gchar* _tmp11_; gchar* _tmp12_; @@ -1320,7 +1321,7 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp12_; #line 514 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1296 "Resources.c" +#line 1297 "Resources.c" } default: { @@ -1331,7 +1332,7 @@ gchar* resources_rating_progress (Rating rating) { result = _tmp13_; #line 516 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1307 "Resources.c" +#line 1308 "Resources.c" } } } @@ -1346,7 +1347,7 @@ gchar* resources_get_stars (Rating rating) { switch (_tmp0_) { #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1322 "Resources.c" +#line 1323 "Resources.c" { gchar* _tmp1_; #line 525 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1355,11 +1356,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp1_; #line 525 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1331 "Resources.c" +#line 1332 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1335 "Resources.c" +#line 1336 "Resources.c" { gchar* _tmp2_; #line 527 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1368,11 +1369,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp2_; #line 527 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1344 "Resources.c" +#line 1345 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1348 "Resources.c" +#line 1349 "Resources.c" { gchar* _tmp3_; #line 529 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1381,11 +1382,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp3_; #line 529 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1357 "Resources.c" +#line 1358 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1361 "Resources.c" +#line 1362 "Resources.c" { gchar* _tmp4_; #line 531 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1394,11 +1395,11 @@ gchar* resources_get_stars (Rating rating) { result = _tmp4_; #line 531 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1370 "Resources.c" +#line 1371 "Resources.c" } #line 523 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1374 "Resources.c" +#line 1375 "Resources.c" { gchar* _tmp5_; #line 533 "/home/jens/Source/shotwell/src/Resources.vala" @@ -1407,7 +1408,7 @@ gchar* resources_get_stars (Rating rating) { result = _tmp5_; #line 533 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1383 "Resources.c" +#line 1384 "Resources.c" } default: { @@ -1418,7 +1419,7 @@ gchar* resources_get_stars (Rating rating) { result = _tmp6_; #line 535 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1394 "Resources.c" +#line 1395 "Resources.c" } } } @@ -1433,7 +1434,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { switch (_tmp0_) { #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_REJECTED: -#line 1409 "Resources.c" +#line 1410 "Resources.c" { gint _tmp1_; GdkPixbuf* _tmp2_; @@ -1445,11 +1446,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp2_; #line 542 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1421 "Resources.c" +#line 1422 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_ONE: -#line 1425 "Resources.c" +#line 1426 "Resources.c" { gint _tmp3_; GdkPixbuf* _tmp4_; @@ -1461,11 +1462,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp4_; #line 545 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1437 "Resources.c" +#line 1438 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_TWO: -#line 1441 "Resources.c" +#line 1442 "Resources.c" { gint _tmp5_; GdkPixbuf* _tmp6_; @@ -1477,11 +1478,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp6_; #line 547 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1453 "Resources.c" +#line 1454 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_THREE: -#line 1457 "Resources.c" +#line 1458 "Resources.c" { gint _tmp7_; GdkPixbuf* _tmp8_; @@ -1493,11 +1494,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp8_; #line 549 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1469 "Resources.c" +#line 1470 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FOUR: -#line 1473 "Resources.c" +#line 1474 "Resources.c" { gint _tmp9_; GdkPixbuf* _tmp10_; @@ -1509,11 +1510,11 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp10_; #line 551 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1485 "Resources.c" +#line 1486 "Resources.c" } #line 540 "/home/jens/Source/shotwell/src/Resources.vala" case RATING_FIVE: -#line 1489 "Resources.c" +#line 1490 "Resources.c" { gint _tmp11_; GdkPixbuf* _tmp12_; @@ -1525,7 +1526,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = _tmp12_; #line 553 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1501 "Resources.c" +#line 1502 "Resources.c" } default: { @@ -1533,7 +1534,7 @@ GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) { result = NULL; #line 555 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 1509 "Resources.c" +#line 1510 "Resources.c" } } } @@ -2145,7 +2146,7 @@ void resources_generate_rating_strings (void) { _g_free0 (label_base); #line 559 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (menu_base); -#line 2121 "Resources.c" +#line 2122 "Resources.c" } @@ -2164,7 +2165,7 @@ gchar* resources_jump_to_file_failed (GError* err) { result = _tmp2_; #line 670 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2140 "Resources.c" +#line 2141 "Resources.c" } @@ -2179,7 +2180,7 @@ void resources_init (void) { _g_object_unref0 (_tmp1_); #line 694 "/home/jens/Source/shotwell/src/Resources.vala" resources_generate_rating_strings (); -#line 2155 "Resources.c" +#line 2156 "Resources.c" } @@ -2231,7 +2232,7 @@ void resources_fetch_lc_time_format (void) { if (_tmp2_ != NULL) { #line 715 "/home/jens/Source/shotwell/src/Resources.vala" g_unsetenv ("LANGUAGE"); -#line 2207 "Resources.c" +#line 2208 "Resources.c" } #line 719 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = setlocale (LC_MESSAGES, NULL); @@ -2249,13 +2250,13 @@ void resources_fetch_lc_time_format (void) { _tmp7_ = lc_time; #line 722 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp7_ != NULL) { -#line 2225 "Resources.c" +#line 2226 "Resources.c" const gchar* _tmp8_; #line 723 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = lc_time; #line 723 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp8_); -#line 2231 "Resources.c" +#line 2232 "Resources.c" } #line 730 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = g_strdup ("%X"); @@ -2305,25 +2306,25 @@ void resources_fetch_lc_time_format (void) { _tmp17_ = old_messages; #line 762 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp17_ != NULL) { -#line 2281 "Resources.c" +#line 2282 "Resources.c" const gchar* _tmp18_; #line 763 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = old_messages; #line 763 "/home/jens/Source/shotwell/src/Resources.vala" setlocale (LC_MESSAGES, _tmp18_); -#line 2287 "Resources.c" +#line 2288 "Resources.c" } #line 766 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = old_language; #line 766 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp19_ != NULL) { -#line 2293 "Resources.c" +#line 2294 "Resources.c" const gchar* _tmp20_; #line 767 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = old_language; #line 767 "/home/jens/Source/shotwell/src/Resources.vala" g_setenv ("LANGUAGE", _tmp20_, TRUE); -#line 2299 "Resources.c" +#line 2300 "Resources.c" } #line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (lc_time); @@ -2331,7 +2332,7 @@ void resources_fetch_lc_time_format (void) { _g_free0 (old_messages); #line 710 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (old_language); -#line 2307 "Resources.c" +#line 2308 "Resources.c" } @@ -2368,7 +2369,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start _tmp3_ = _result_; #line 1044 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 2344 "Resources.c" +#line 2345 "Resources.c" gchar* _tmp4_; #line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = _result_; @@ -2376,13 +2377,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start result = (gint) (_tmp4_ - ((gchar*) self)); #line 1045 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2352 "Resources.c" +#line 2353 "Resources.c" } else { #line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = -1; #line 1047 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2358 "Resources.c" +#line 2359 "Resources.c" } } @@ -2406,7 +2407,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 2382 "Resources.c" +#line 2383 "Resources.c" glong _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -2414,7 +2415,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2390 "Resources.c" +#line 2391 "Resources.c" } else { gchar* _tmp5_; gchar* _tmp6_; @@ -2426,7 +2427,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2402 "Resources.c" +#line 2403 "Resources.c" } } @@ -2450,21 +2451,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 2426 "Resources.c" +#line 2427 "Resources.c" glong _tmp2_; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 2432 "Resources.c" +#line 2433 "Resources.c" } else { #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 2436 "Resources.c" +#line 2437 "Resources.c" } #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 2440 "Resources.c" +#line 2441 "Resources.c" glong _tmp3_; glong _tmp4_; glong _tmp5_; @@ -2476,7 +2477,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 2452 "Resources.c" +#line 2453 "Resources.c" } else { gint _tmp6_; gint _tmp7_; @@ -2486,13 +2487,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 2462 "Resources.c" +#line 2463 "Resources.c" } #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 2468 "Resources.c" +#line 2469 "Resources.c" glong _tmp9_; glong _tmp10_; glong _tmp11_; @@ -2506,7 +2507,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 2482 "Resources.c" +#line 2483 "Resources.c" } else { glong _tmp12_; glong _tmp13_; @@ -2516,13 +2517,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 2492 "Resources.c" +#line 2493 "Resources.c" } #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 2498 "Resources.c" +#line 2499 "Resources.c" glong _tmp15_; glong _tmp16_; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -2531,7 +2532,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 2507 "Resources.c" +#line 2508 "Resources.c" } #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -2551,7 +2552,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 2527 "Resources.c" +#line 2528 "Resources.c" } @@ -2563,12 +2564,12 @@ static gboolean _vala_string_array_contains (const gchar* * stack, int stack_len if (g_strcmp0 (stack[i], needle) == 0) { #line 798 "/home/jens/Source/shotwell/src/Resources.vala" return TRUE; -#line 2539 "Resources.c" +#line 2540 "Resources.c" } } #line 798 "/home/jens/Source/shotwell/src/Resources.vala" return FALSE; -#line 2544 "Resources.c" +#line 2545 "Resources.c" } @@ -2588,7 +2589,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _tmp0_ = resources_unit_system; #line 783 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) { -#line 2564 "Resources.c" +#line 2565 "Resources.c" ResourcesUnitSystem _tmp1_; #line 784 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_unit_system; @@ -2596,7 +2597,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { result = _tmp1_; #line 784 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2572 "Resources.c" +#line 2573 "Resources.c" } #line 787 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = g_getenv ("LC_MEASUREMENT"); @@ -2610,7 +2611,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _tmp4_ = resources_lc_measurement; #line 788 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp4_ == NULL) { -#line 2586 "Resources.c" +#line 2587 "Resources.c" gchar** _tmp5_; gchar** _tmp6_; const gchar* _tmp7_; @@ -2625,7 +2626,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _g_free0 (resources_lc_measurement); #line 789 "/home/jens/Source/shotwell/src/Resources.vala" resources_lc_measurement = _tmp8_; -#line 2601 "Resources.c" +#line 2602 "Resources.c" } #line 792 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = resources_lc_measurement; @@ -2637,7 +2638,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _tmp11_ = index; #line 793 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp11_ > 0) { -#line 2613 "Resources.c" +#line 2614 "Resources.c" const gchar* _tmp12_; gint _tmp13_; gchar* _tmp14_; @@ -2651,7 +2652,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { _g_free0 (resources_lc_measurement); #line 794 "/home/jens/Source/shotwell/src/Resources.vala" resources_lc_measurement = _tmp14_; -#line 2627 "Resources.c" +#line 2628 "Resources.c" } #line 797 "/home/jens/Source/shotwell/src/Resources.vala" resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC; @@ -2661,7 +2662,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { if (_vala_string_array_contains (RESOURCES_IMPERIAL_COUNTRIES, G_N_ELEMENTS (RESOURCES_IMPERIAL_COUNTRIES), _tmp15_)) { #line 799 "/home/jens/Source/shotwell/src/Resources.vala" resources_unit_system = RESOURCES_UNIT_SYSTEM_IMPERIAL; -#line 2637 "Resources.c" +#line 2638 "Resources.c" } #line 802 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = resources_unit_system; @@ -2669,7 +2670,7 @@ ResourcesUnitSystem resources_get_default_measurement_unit (void) { result = _tmp16_; #line 802 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2645 "Resources.c" +#line 2646 "Resources.c" } @@ -2688,7 +2689,7 @@ gchar* resources_get_hh_mm_format_string (void) { if (_tmp0_ == NULL) { #line 811 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2664 "Resources.c" +#line 2665 "Resources.c" } #line 814 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_FORMAT_STRING; @@ -2698,7 +2699,7 @@ gchar* resources_get_hh_mm_format_string (void) { result = _tmp2_; #line 814 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2674 "Resources.c" +#line 2675 "Resources.c" } @@ -2713,7 +2714,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) { if (_tmp0_ == NULL) { #line 819 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2689 "Resources.c" +#line 2690 "Resources.c" } #line 822 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_HH_MM_SS_FORMAT_STRING; @@ -2723,7 +2724,7 @@ gchar* resources_get_hh_mm_ss_format_string (void) { result = _tmp2_; #line 822 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2699 "Resources.c" +#line 2700 "Resources.c" } @@ -2738,7 +2739,7 @@ gchar* resources_get_long_date_format_string (void) { if (_tmp0_ == NULL) { #line 827 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2714 "Resources.c" +#line 2715 "Resources.c" } #line 830 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_LONG_DATE_FORMAT_STRING; @@ -2748,7 +2749,7 @@ gchar* resources_get_long_date_format_string (void) { result = _tmp2_; #line 830 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2724 "Resources.c" +#line 2725 "Resources.c" } @@ -2763,7 +2764,7 @@ gchar* resources_get_start_multiday_span_format_string (void) { if (_tmp0_ == NULL) { #line 835 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2739 "Resources.c" +#line 2740 "Resources.c" } #line 838 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING; @@ -2773,7 +2774,7 @@ gchar* resources_get_start_multiday_span_format_string (void) { result = _tmp2_; #line 838 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2749 "Resources.c" +#line 2750 "Resources.c" } @@ -2788,7 +2789,7 @@ gchar* resources_get_end_multiday_span_format_string (void) { if (_tmp0_ == NULL) { #line 843 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2764 "Resources.c" +#line 2765 "Resources.c" } #line 846 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING; @@ -2798,7 +2799,7 @@ gchar* resources_get_end_multiday_span_format_string (void) { result = _tmp2_; #line 846 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2774 "Resources.c" +#line 2775 "Resources.c" } @@ -2813,7 +2814,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) { if (_tmp0_ == NULL) { #line 851 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2789 "Resources.c" +#line 2790 "Resources.c" } #line 854 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING; @@ -2823,7 +2824,7 @@ gchar* resources_get_start_multimonth_span_format_string (void) { result = _tmp2_; #line 854 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2799 "Resources.c" +#line 2800 "Resources.c" } @@ -2838,7 +2839,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) { if (_tmp0_ == NULL) { #line 859 "/home/jens/Source/shotwell/src/Resources.vala" resources_fetch_lc_time_format (); -#line 2814 "Resources.c" +#line 2815 "Resources.c" } #line 862 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING; @@ -2848,7 +2849,7 @@ gchar* resources_get_end_multimonth_span_format_string (void) { result = _tmp2_; #line 862 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2824 "Resources.c" +#line 2825 "Resources.c" } @@ -2866,14 +2867,14 @@ gchar* resources_get_ui (const gchar* filename) { result = _tmp1_; #line 866 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2842 "Resources.c" +#line 2843 "Resources.c" } static gpointer _g_object_ref0 (gpointer self) { #line 882 "/home/jens/Source/shotwell/src/Resources.vala" return self ? g_object_ref (self) : NULL; -#line 2849 "Resources.c" +#line 2850 "Resources.c" } @@ -2887,7 +2888,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { _tmp0_ = resources_noninterpretable_badge_pixbuf; #line 873 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 2863 "Resources.c" +#line 2864 "Resources.c" { gchar* path = NULL; gchar* _tmp1_; @@ -2909,8 +2910,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 876 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 2885 "Resources.c" - goto __catch430_g_error; +#line 2886 "Resources.c" + goto __catch438_g_error; } #line 876 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp2_; @@ -2924,10 +2925,10 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { _g_object_unref0 (_tmp2_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 2900 "Resources.c" +#line 2901 "Resources.c" } - goto __finally430; - __catch430_g_error: + goto __finally438; + __catch438_g_error: { GError* err = NULL; const gchar* _tmp6_; @@ -2942,9 +2943,9 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { "e: %s", _tmp6_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 2917 "Resources.c" +#line 2918 "Resources.c" } - __finally430: + __finally438: #line 874 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 874 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2953,7 +2954,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { g_clear_error (&_inner_error_); #line 874 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 2928 "Resources.c" +#line 2929 "Resources.c" } } #line 882 "/home/jens/Source/shotwell/src/Resources.vala" @@ -2964,7 +2965,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) { result = _tmp8_; #line 882 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2939 "Resources.c" +#line 2940 "Resources.c" } @@ -2985,7 +2986,7 @@ GtkIconTheme* resources_get_icon_theme_engine (void) { result = icon_theme; #line 889 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 2960 "Resources.c" +#line 2961 "Resources.c" } @@ -3016,7 +3017,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _tmp0_ = resources_scaled_icon_cache; #line 895 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ != NULL) { -#line 2991 "Resources.c" +#line 2992 "Resources.c" gchar* scaled_name = NULL; const gchar* _tmp1_; gint _tmp2_; @@ -3040,7 +3041,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_); #line 897 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp6_) { -#line 3015 "Resources.c" +#line 3016 "Resources.c" GeeHashMap* _tmp7_; const gchar* _tmp8_; gpointer _tmp9_; @@ -3056,17 +3057,17 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _g_free0 (scaled_name); #line 898 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3031 "Resources.c" +#line 3032 "Resources.c" } #line 895 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (scaled_name); -#line 3035 "Resources.c" +#line 3036 "Resources.c" } #line 903 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = resources_icon_cache; #line 903 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp10_ == NULL) { -#line 3041 "Resources.c" +#line 3042 "Resources.c" GeeHashMap* _tmp11_; #line 904 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3074,7 +3075,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _g_object_unref0 (resources_icon_cache); #line 904 "/home/jens/Source/shotwell/src/Resources.vala" resources_icon_cache = _tmp11_; -#line 3049 "Resources.c" +#line 3050 "Resources.c" } #line 907 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = resources_icon_cache; @@ -3088,7 +3089,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _tmp15_ = pixbuf; #line 908 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp15_ == NULL) { -#line 3063 "Resources.c" +#line 3064 "Resources.c" const gchar* _tmp16_; GdkPixbuf* _tmp17_; GdkPixbuf* _tmp18_; @@ -3113,7 +3114,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _g_object_unref0 (pixbuf); #line 911 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3088 "Resources.c" +#line 3089 "Resources.c" } #line 913 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = resources_icon_cache; @@ -3123,7 +3124,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _tmp21_ = pixbuf; #line 913 "/home/jens/Source/shotwell/src/Resources.vala" gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_); -#line 3098 "Resources.c" +#line 3099 "Resources.c" } #line 916 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = scale; @@ -3133,7 +3134,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { result = pixbuf; #line 917 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3108 "Resources.c" +#line 3109 "Resources.c" } #line 919 "/home/jens/Source/shotwell/src/Resources.vala" _tmp23_ = pixbuf; @@ -3147,7 +3148,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _tmp26_ = resources_scaled_icon_cache; #line 921 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp26_ == NULL) { -#line 3122 "Resources.c" +#line 3123 "Resources.c" GeeHashMap* _tmp27_; #line 922 "/home/jens/Source/shotwell/src/Resources.vala" _tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -3155,7 +3156,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _g_object_unref0 (resources_scaled_icon_cache); #line 922 "/home/jens/Source/shotwell/src/Resources.vala" resources_scaled_icon_cache = _tmp27_; -#line 3130 "Resources.c" +#line 3131 "Resources.c" } #line 924 "/home/jens/Source/shotwell/src/Resources.vala" _tmp28_ = resources_scaled_icon_cache; @@ -3179,7 +3180,7 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) { _g_object_unref0 (pixbuf); #line 926 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3154 "Resources.c" +#line 3155 "Resources.c" } @@ -3194,7 +3195,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { g_return_val_if_fail (name != NULL, NULL); #line 930 "/home/jens/Source/shotwell/src/Resources.vala" pixbuf = NULL; -#line 3169 "Resources.c" +#line 3170 "Resources.c" { gchar* path = NULL; const gchar* _tmp0_; @@ -3216,8 +3217,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { if (G_UNLIKELY (_inner_error_ != NULL)) { #line 933 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 3191 "Resources.c" - goto __catch431_g_error; +#line 3192 "Resources.c" + goto __catch439_g_error; } #line 933 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = _tmp2_; @@ -3231,10 +3232,10 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { _g_object_unref0 (_tmp2_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (path); -#line 3206 "Resources.c" +#line 3207 "Resources.c" } - goto __finally431; - __catch431_g_error: + goto __finally439; + __catch439_g_error: { GError* err = NULL; const gchar* _tmp5_; @@ -3254,9 +3255,9 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { g_critical ("Resources.vala:935: Unable to load icon %s: %s", _tmp5_, _tmp7_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (err); -#line 3229 "Resources.c" +#line 3230 "Resources.c" } - __finally431: + __finally439: #line 931 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 931 "/home/jens/Source/shotwell/src/Resources.vala" @@ -3267,7 +3268,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { g_clear_error (&_inner_error_); #line 931 "/home/jens/Source/shotwell/src/Resources.vala" return NULL; -#line 3242 "Resources.c" +#line 3243 "Resources.c" } #line 938 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = pixbuf; @@ -3279,13 +3280,13 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { _g_object_unref0 (pixbuf); #line 939 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3254 "Resources.c" +#line 3255 "Resources.c" } #line 941 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = scale; #line 941 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp10_ > 0) { -#line 3260 "Resources.c" +#line 3261 "Resources.c" GdkPixbuf* _tmp11_; gint _tmp12_; GdkPixbuf* _tmp13_; @@ -3299,7 +3300,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { _g_object_unref0 (_tmp9_); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp13_; -#line 3274 "Resources.c" +#line 3275 "Resources.c" } else { GdkPixbuf* _tmp14_; GdkPixbuf* _tmp15_; @@ -3311,7 +3312,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { _g_object_unref0 (_tmp9_); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp15_; -#line 3286 "Resources.c" +#line 3287 "Resources.c" } #line 941 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp9_; @@ -3319,106 +3320,151 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) { _g_object_unref0 (pixbuf); #line 941 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3294 "Resources.c" +#line 3295 "Resources.c" } gchar* resources_get_help_path (void) { gchar* result = NULL; - GFile* help_dir = NULL; + GFile* dir = NULL; GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; - GFile* _tmp3_; - GFile* _tmp4_; - GFile* _tmp5_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + GFile* help_dir = NULL; + GFile* _tmp10_; + GFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + GFile* _tmp14_; GFile* help_index = NULL; - GFile* _tmp6_; - GFile* _tmp7_; - GFile* _tmp8_; - gboolean _tmp9_; -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" + GFile* _tmp15_; + GFile* _tmp16_; + GFile* _tmp17_; + gboolean _tmp18_; +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = app_dirs_get_exec_dir (); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp1_ = _tmp0_; -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp2_ = g_file_get_child (_tmp1_, "help"); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" +#line 951 "/home/jens/Source/shotwell/src/Resources.vala" + dir = _tmp0_; +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp1_ = dir; +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp2_ = g_file_get_path (_tmp1_); +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_; -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp4_ = g_file_get_child (_tmp3_, "C"); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp5_ = _tmp4_; -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp3_); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - _g_object_unref0 (_tmp1_); -#line 952 "/home/jens/Source/shotwell/src/Resources.vala" - help_dir = _tmp5_; #line 953 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp6_ = help_dir; + _tmp4_ = g_str_has_suffix (_tmp3_, "src"); +#line 953 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp5_ = _tmp4_; #line 953 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp7_ = g_file_get_child (_tmp6_, "index.page"); + _g_free0 (_tmp3_); #line 953 "/home/jens/Source/shotwell/src/Resources.vala" - help_index = _tmp7_; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp8_ = help_index; -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp9_ = g_file_query_exists (_tmp8_, NULL); -#line 955 "/home/jens/Source/shotwell/src/Resources.vala" - if (_tmp9_) { -#line 3342 "Resources.c" - gchar* help_path = NULL; - GFile* _tmp10_; - gchar* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; -#line 958 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp10_ = help_dir; + if (_tmp5_) { +#line 3337 "Resources.c" + GFile* _tmp6_; + GFile* _tmp7_; + GFile* _tmp8_; + GFile* _tmp9_; +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp6_ = dir; +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp7_ = g_file_get_parent (_tmp6_); +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp8_ = _tmp7_; +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp9_ = g_file_get_parent (_tmp8_); +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (dir); +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + dir = _tmp9_; +#line 954 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (_tmp8_); +#line 3356 "Resources.c" + } +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp10_ = dir; +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp11_ = g_file_get_child (_tmp10_, "help"); +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp12_ = _tmp11_; +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp13_ = g_file_get_child (_tmp12_, "C"); +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp14_ = _tmp13_; +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (_tmp12_); +#line 957 "/home/jens/Source/shotwell/src/Resources.vala" + help_dir = _tmp14_; #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp11_ = g_file_get_path (_tmp10_); + _tmp15_ = help_dir; #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - _g_free0 (help_path); + _tmp16_ = g_file_get_child (_tmp15_, "index.page"); #line 958 "/home/jens/Source/shotwell/src/Resources.vala" - help_path = _tmp11_; + help_index = _tmp16_; #line 960 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp12_ = help_path; + _tmp17_ = help_index; #line 960 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp13_ = g_str_has_suffix (_tmp12_, "/"); + _tmp18_ = g_file_query_exists (_tmp17_, NULL); #line 960 "/home/jens/Source/shotwell/src/Resources.vala" - if (!_tmp13_) { -#line 3362 "Resources.c" - const gchar* _tmp14_; - gchar* _tmp15_; -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp14_ = help_path; -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - _tmp15_ = g_strconcat (_tmp14_, "/", NULL); -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" + if (_tmp18_) { +#line 3384 "Resources.c" + gchar* help_path = NULL; + GFile* _tmp19_; + gchar* _tmp20_; + const gchar* _tmp21_; + gboolean _tmp22_; +#line 963 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp19_ = help_dir; +#line 963 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp20_ = g_file_get_path (_tmp19_); +#line 963 "/home/jens/Source/shotwell/src/Resources.vala" + _g_free0 (help_path); +#line 963 "/home/jens/Source/shotwell/src/Resources.vala" + help_path = _tmp20_; +#line 965 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp21_ = help_path; +#line 965 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp22_ = g_str_has_suffix (_tmp21_, "/"); +#line 965 "/home/jens/Source/shotwell/src/Resources.vala" + if (!_tmp22_) { +#line 3404 "Resources.c" + const gchar* _tmp23_; + gchar* _tmp24_; +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp23_ = help_path; +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp24_ = g_strconcat (_tmp23_, "/", NULL); +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 961 "/home/jens/Source/shotwell/src/Resources.vala" - help_path = _tmp15_; -#line 3373 "Resources.c" +#line 966 "/home/jens/Source/shotwell/src/Resources.vala" + help_path = _tmp24_; +#line 3415 "Resources.c" } -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" result = help_path; -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_index); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_dir); -#line 964 "/home/jens/Source/shotwell/src/Resources.vala" +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (dir); +#line 969 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3383 "Resources.c" +#line 3427 "Resources.c" } -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" result = NULL; -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_index); -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (help_dir); -#line 970 "/home/jens/Source/shotwell/src/Resources.vala" +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" + _g_object_unref0 (dir); +#line 975 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3393 "Resources.c" +#line 3439 "Resources.c" } @@ -3428,17 +3474,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err const gchar* _tmp1_; const gchar* _tmp27_; GError * _inner_error_ = NULL; -#line 973 "/home/jens/Source/shotwell/src/Resources.vala" +#line 978 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GDK_IS_SCREEN (screen)); -#line 974 "/home/jens/Source/shotwell/src/Resources.vala" +#line 979 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_get_help_path (); -#line 974 "/home/jens/Source/shotwell/src/Resources.vala" +#line 979 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp0_; -#line 976 "/home/jens/Source/shotwell/src/Resources.vala" +#line 981 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = help_path; -#line 976 "/home/jens/Source/shotwell/src/Resources.vala" +#line 981 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp1_ != NULL) { -#line 3413 "Resources.c" +#line 3459 "Resources.c" const gchar* _tmp2_; gchar** argv = NULL; gchar** _tmp6_; @@ -3470,179 +3516,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err gchar** _tmp25_; gint _tmp25__length1; const gchar* _tmp26_; -#line 980 "/home/jens/Source/shotwell/src/Resources.vala" +#line 985 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = anchor; -#line 980 "/home/jens/Source/shotwell/src/Resources.vala" +#line 985 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp2_ != NULL) { -#line 3449 "Resources.c" +#line 3495 "Resources.c" const gchar* _tmp3_; const gchar* _tmp4_; gchar* _tmp5_; -#line 981 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = help_path; -#line 981 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = anchor; -#line 981 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL); -#line 981 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 981 "/home/jens/Source/shotwell/src/Resources.vala" +#line 986 "/home/jens/Source/shotwell/src/Resources.vala" help_path = _tmp5_; -#line 3463 "Resources.c" +#line 3509 "Resources.c" } -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_new0 (gchar*, 3 + 1); -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" argv = _tmp6_; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" argv_length1 = 3; -#line 984 "/home/jens/Source/shotwell/src/Resources.vala" +#line 989 "/home/jens/Source/shotwell/src/Resources.vala" _argv_size_ = argv_length1; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = argv; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7__length1 = argv_length1; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = g_strdup ("yelp"); -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp7_[0]); -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_[0] = _tmp8_; -#line 985 "/home/jens/Source/shotwell/src/Resources.vala" +#line 990 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = _tmp7_[0]; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = argv; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10__length1 = argv_length1; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = help_path; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = g_strdup (_tmp11_); -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp10_[1]); -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_[1] = _tmp12_; -#line 986 "/home/jens/Source/shotwell/src/Resources.vala" +#line 991 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = _tmp10_[1]; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = argv; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14__length1 = argv_length1; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp14_[2]); -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_[2] = NULL; -#line 987 "/home/jens/Source/shotwell/src/Resources.vala" +#line 992 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = _tmp14_[2]; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = app_dirs_get_exec_dir (); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = _tmp17_; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = g_file_get_path (_tmp18_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = _tmp19_; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = argv; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21__length1 = argv_length1; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" pid = _tmp22_; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp24_ = _tmp23_; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp20_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp18_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = _tmp24_; -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3543 "Resources.c" +#line 3589 "Resources.c" } -#line 990 "/home/jens/Source/shotwell/src/Resources.vala" +#line 995 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp16_) { -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 992 "/home/jens/Source/shotwell/src/Resources.vala" +#line 997 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3553 "Resources.c" +#line 3599 "Resources.c" } -#line 995 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25_ = argv; -#line 995 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" _tmp25__length1 = argv_length1; -#line 995 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" _tmp26_ = _tmp25_[0]; -#line 995 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:995: Unable to launch %s", _tmp26_); -#line 976 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" + g_warning ("Resources.vala:1000: Unable to launch %s", _tmp26_); +#line 981 "/home/jens/Source/shotwell/src/Resources.vala" argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL); -#line 3565 "Resources.c" +#line 3611 "Resources.c" } -#line 999 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" _tmp27_ = anchor; -#line 999 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1004 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp27_ != NULL) { -#line 3571 "Resources.c" +#line 3617 "Resources.c" GdkScreen* _tmp28_; const gchar* _tmp29_; gchar* _tmp30_; gchar* _tmp31_; -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _tmp28_ = screen; -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _tmp29_ = anchor; -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL); -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _tmp31_ = _tmp30_; -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" sys_show_uri (_tmp28_, _tmp31_, &_inner_error_); -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (_tmp31_); -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1000 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1005 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3596 "Resources.c" +#line 3642 "Resources.c" } } else { GdkScreen* _tmp32_; -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" _tmp32_ = screen; -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_); -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" g_propagate_error (error, _inner_error_); -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 1002 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3612 "Resources.c" +#line 3658 "Resources.c" } } -#line 973 "/home/jens/Source/shotwell/src/Resources.vala" +#line 978 "/home/jens/Source/shotwell/src/Resources.vala" _g_free0 (help_path); -#line 3617 "Resources.c" +#line 3663 "Resources.c" } @@ -3658,33 +3704,33 @@ gchar* resources_to_css_color (GdkRGBA* color) { GdkRGBA _tmp4_; gdouble _tmp5_; gchar* _tmp6_; -#line 1006 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1011 "/home/jens/Source/shotwell/src/Resources.vala" g_return_val_if_fail (color != NULL, NULL); -#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1012 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = *color; -#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1012 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = _tmp0_.red; -#line 1007 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1012 "/home/jens/Source/shotwell/src/Resources.vala" r = (gint) (_tmp1_ * 255); -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = *color; -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = _tmp2_.green; -#line 1008 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1013 "/home/jens/Source/shotwell/src/Resources.vala" g = (gint) (_tmp3_ * 255); -#line 1009 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1014 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = *color; -#line 1009 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1014 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = _tmp4_.blue; -#line 1009 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1014 "/home/jens/Source/shotwell/src/Resources.vala" b = (gint) (_tmp5_ * 255); -#line 1011 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b); -#line 1011 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" result = _tmp6_; -#line 1011 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1016 "/home/jens/Source/shotwell/src/Resources.vala" return result; -#line 3659 "Resources.c" +#line 3705 "Resources.c" } @@ -3702,136 +3748,177 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) { GtkWidget* _tmp21_; GtkCssProvider* _tmp22_; GError * _inner_error_ = NULL; -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" g_return_if_fail (stylesheet != NULL); -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1024 "/home/jens/Source/shotwell/src/Resources.vala" _tmp0_ = resources_providers; -#line 1019 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1024 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp0_ == NULL) { -#line 3685 "Resources.c" +#line 3731 "Resources.c" GeeHashMap* _tmp1_; -#line 1020 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1025 "/home/jens/Source/shotwell/src/Resources.vala" _tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); -#line 1020 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1025 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (resources_providers); -#line 1020 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1025 "/home/jens/Source/shotwell/src/Resources.vala" resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap); -#line 3693 "Resources.c" +#line 3739 "Resources.c" } -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" _tmp2_ = resources_providers; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" _tmp3_ = widget; -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" _tmp4_ = gee_map_has_key (_tmp2_, _tmp3_); -#line 1022 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" if (_tmp4_) { -#line 3703 "Resources.c" +#line 3749 "Resources.c" GtkWidget* _tmp5_; GtkStyleContext* _tmp6_; GeeMap* _tmp7_; GtkWidget* _tmp8_; gpointer _tmp9_; GtkCssProvider* _tmp10_; -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp5_ = widget; -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp6_ = gtk_widget_get_style_context (_tmp5_); -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp7_ = resources_providers; -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp8_ = widget; -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp9_ = gee_map_get (_tmp7_, _tmp8_); -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _tmp10_ = (GtkCssProvider*) _tmp9_; -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider)); -#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (_tmp10_); -#line 3726 "Resources.c" +#line 3772 "Resources.c" } -#line 1025 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" _tmp11_ = gtk_css_provider_new (); -#line 1025 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" styler = _tmp11_; -#line 3732 "Resources.c" +#line 3778 "Resources.c" { GtkCssProvider* _tmp12_; const gchar* _tmp13_; -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1033 "/home/jens/Source/shotwell/src/Resources.vala" _tmp12_ = styler; -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1033 "/home/jens/Source/shotwell/src/Resources.vala" _tmp13_ = stylesheet; -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1033 "/home/jens/Source/shotwell/src/Resources.vala" gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_); -#line 1028 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1033 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3744 "Resources.c" - goto __catch432_g_error; +#line 3790 "Resources.c" + goto __catch440_g_error; } } - goto __finally432; - __catch432_g_error: + goto __finally440; + __catch440_g_error: { GError* e = NULL; const gchar* _tmp14_; GError* _tmp15_; const gchar* _tmp16_; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" e = _inner_error_; -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" _inner_error_ = NULL; -#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1035 "/home/jens/Source/shotwell/src/Resources.vala" _tmp14_ = stylesheet; -#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1035 "/home/jens/Source/shotwell/src/Resources.vala" _tmp15_ = e; -#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1035 "/home/jens/Source/shotwell/src/Resources.vala" _tmp16_ = _tmp15_->message; -#line 1030 "/home/jens/Source/shotwell/src/Resources.vala" - g_warning ("Resources.vala:1030: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1035 "/home/jens/Source/shotwell/src/Resources.vala" + g_warning ("Resources.vala:1035: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_); +#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" _g_error_free0 (e); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 1034 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1039 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3773 "Resources.c" +#line 3819 "Resources.c" } - __finally432: -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" + __finally440: +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/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 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" g_clear_error (&_inner_error_); -#line 1027 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1032 "/home/jens/Source/shotwell/src/Resources.vala" return; -#line 3786 "Resources.c" +#line 3832 "Resources.c" } -#line 1037 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1042 "/home/jens/Source/shotwell/src/Resources.vala" _tmp17_ = widget; -#line 1037 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1042 "/home/jens/Source/shotwell/src/Resources.vala" _tmp18_ = gtk_widget_get_style_context (_tmp17_); -#line 1037 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1042 "/home/jens/Source/shotwell/src/Resources.vala" _tmp19_ = styler; -#line 1037 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1042 "/home/jens/Source/shotwell/src/Resources.vala" gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1045 "/home/jens/Source/shotwell/src/Resources.vala" _tmp20_ = resources_providers; -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1045 "/home/jens/Source/shotwell/src/Resources.vala" _tmp21_ = widget; -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1045 "/home/jens/Source/shotwell/src/Resources.vala" _tmp22_ = styler; -#line 1040 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1045 "/home/jens/Source/shotwell/src/Resources.vala" gee_map_set (_tmp20_, _tmp21_, _tmp22_); -#line 1018 "/home/jens/Source/shotwell/src/Resources.vala" +#line 1023 "/home/jens/Source/shotwell/src/Resources.vala" _g_object_unref0 (styler); -#line 3806 "Resources.c" +#line 3852 "Resources.c" +} + + +gint resources_use_header_bar (void) { + gint result = 0; + const gchar* _tmp0_; + gboolean use_header = FALSE; + GtkSettings* _tmp1_; + gint _tmp2_ = 0; + gboolean _tmp3_; +#line 1049 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp0_ = g_getenv ("SHOTWELL_USE_HEADERBARS"); +#line 1049 "/home/jens/Source/shotwell/src/Resources.vala" + if (_tmp0_ != NULL) { +#line 1050 "/home/jens/Source/shotwell/src/Resources.vala" + result = 0; +#line 1050 "/home/jens/Source/shotwell/src/Resources.vala" + return result; +#line 3871 "Resources.c" + } +#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp1_ = gtk_settings_get_default (); +#line 1054 "/home/jens/Source/shotwell/src/Resources.vala" + g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL); +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp3_ = use_header; +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + if (_tmp3_) { +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp2_ = 1; +#line 3883 "Resources.c" + } else { +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + _tmp2_ = 0; +#line 3887 "Resources.c" + } +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + result = _tmp2_; +#line 1056 "/home/jens/Source/shotwell/src/Resources.vala" + return result; +#line 3893 "Resources.c" } |