From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/direct/DirectWindow.c | 338 ++++++++++++++++++++++------------------------ 1 file changed, 162 insertions(+), 176 deletions(-) (limited to 'src/direct/DirectWindow.c') diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c index dc9432e..06465a8 100644 --- a/src/direct/DirectWindow.c +++ b/src/direct/DirectWindow.c @@ -1,4 +1,4 @@ -/* DirectWindow.c generated by valac 0.32.1, the Vala compiler +/* DirectWindow.c generated by valac 0.34.4, the Vala compiler * generated from DirectWindow.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -326,7 +326,6 @@ void page_switched_to (Page* self); GtkToolbar* page_get_toolbar (Page* self); void application_set_menubar (GMenuModel* model); GMenuModel* page_get_menubar (Page* self); -void application_set_appmenu (GMenuModel* model); DirectWindow* direct_window_get_app (void); DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self); Page* page_window_get_current_page (PageWindow* self); @@ -365,14 +364,14 @@ static void direct_window_finalize (GObject* obj); static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_on_photo_changed ((DirectWindow*) self); -#line 369 "DirectWindow.c" +#line 368 "DirectWindow.c" } static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) { #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_on_photo_changed ((DirectWindow*) self); -#line 376 "DirectWindow.c" +#line 375 "DirectWindow.c" } @@ -395,12 +394,9 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) { DirectPhotoPage* _tmp13_ = NULL; GtkToolbar* _tmp14_ = NULL; GtkToolbar* _tmp15_ = NULL; - GtkBuilder* builder = NULL; - GtkBuilder* _tmp16_ = NULL; - DirectPhotoPage* _tmp17_ = NULL; + DirectPhotoPage* _tmp16_ = NULL; + GMenuModel* _tmp17_ = NULL; GMenuModel* _tmp18_ = NULL; - GMenuModel* _tmp19_ = NULL; - GObject* _tmp20_ = NULL; #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" @@ -468,46 +464,36 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) { #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp15_); #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp16_ = gtk_builder_new_from_resource ("/org/gnome/Shotwell/appmenu.ui"); + _tmp16_ = self->priv->direct_photo_page; #line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - builder = _tmp16_; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp17_ = self->priv->direct_photo_page; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp18_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page)); -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp19_ = _tmp18_; -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - application_set_menubar (_tmp19_); -#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (_tmp19_); -#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _tmp20_ = gtk_builder_get_object (builder, "direct-appmenu"); + _tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page)); +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + _tmp18_ = _tmp17_; +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + application_set_menubar (_tmp18_); +#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" + _g_object_unref0 (_tmp18_); #line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - application_set_appmenu (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, g_menu_get_type ()) ? ((GMenu*) _tmp20_) : NULL, g_menu_model_get_type (), GMenuModel)); -#line 31 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget)); -#line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" - _g_object_unref0 (builder); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (layout); #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return self; -#line 497 "DirectWindow.c" +#line 483 "DirectWindow.c" } DirectWindow* direct_window_new (GFile* file) { #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return direct_window_construct (TYPE_DIRECT_WINDOW, file); -#line 504 "DirectWindow.c" +#line 490 "DirectWindow.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return self ? g_object_ref (self) : NULL; -#line 511 "DirectWindow.c" +#line 497 "DirectWindow.c" } @@ -515,30 +501,30 @@ DirectWindow* direct_window_get_app (void) { DirectWindow* result = NULL; AppWindow* _tmp0_ = NULL; DirectWindow* _tmp1_ = NULL; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = app_window_instance; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_WINDOW, DirectWindow)); -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp1_; -#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 527 "DirectWindow.c" +#line 513 "DirectWindow.c" } DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) { DirectPhotoPage* result = NULL; Page* _tmp0_ = NULL; -#line 38 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage); -#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 542 "DirectWindow.c" +#line 528 "DirectWindow.c" } @@ -555,53 +541,53 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); -#line 42 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (G_IS_FILE (file)); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = modified; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp1_) { -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = "*"; -#line 569 "DirectWindow.c" +#line 555 "DirectWindow.c" } else { -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = ""; -#line 573 "DirectWindow.c" +#line 559 "DirectWindow.c" } -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = g_file_get_basename (_tmp2_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = _tmp3_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = file; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = g_file_get_parent (_tmp5_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = _tmp6_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp8_ = get_display_pathname (_tmp7_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp9_ = _tmp8_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp11_ = _tmp10_; -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp11_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp9_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp7_); -#line 43 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_free0 (_tmp4_); -#line 605 "DirectWindow.c" +#line 591 "DirectWindow.c" } @@ -614,33 +600,33 @@ static void direct_window_real_on_fullscreen (AppWindow* base) { GFile* _tmp3_ = NULL; DirectFullscreenPhotoPage* _tmp4_ = NULL; DirectFullscreenPhotoPage* _tmp5_ = NULL; -#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_get_current_file (_tmp1_); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = _tmp2_; -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" file = _tmp3_; -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = direct_fullscreen_photo_page_new (file); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_object_ref_sink (_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page)); -#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (file); -#line 644 "DirectWindow.c" +#line 630 "DirectWindow.c" } @@ -648,15 +634,15 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) { DirectWindow * self; gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 53 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = g_strdup (RESOURCES_APP_DIRECT_ROLE); -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp0_; -#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 660 "DirectWindow.c" +#line 646 "DirectWindow.c" } @@ -665,43 +651,43 @@ static void direct_window_on_photo_changed (DirectWindow* self) { DirectPhotoPage* _tmp0_ = NULL; Photo* _tmp1_ = NULL; Photo* _tmp2_ = NULL; -#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_if_fail (IS_DIRECT_WINDOW (self)); -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = self->priv->direct_photo_page; -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EDITING_HOST_PAGE, EditingHostPage)); -#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" photo = _tmp1_; -#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = photo; -#line 59 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp2_ != NULL) { -#line 681 "DirectWindow.c" +#line 667 "DirectWindow.c" Photo* _tmp3_ = NULL; GFile* _tmp4_ = NULL; GFile* _tmp5_ = NULL; Photo* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = photo; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = photo; -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = photo_has_alterations (_tmp6_); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" direct_window_update_title (self, _tmp5_, _tmp7_); -#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 701 "DirectWindow.c" +#line 687 "DirectWindow.c" } -#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (photo); -#line 705 "DirectWindow.c" +#line 691 "DirectWindow.c" } @@ -715,39 +701,39 @@ static void direct_window_real_on_quit (AppWindow* base) { ConfigFacade* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; Dimensions _tmp7_ = {0}; -#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = !_tmp2_; -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp3_) { -#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return; -#line 735 "DirectWindow.c" +#line 721 "DirectWindow.c" } -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = config_facade_get_instance (); -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = _tmp4_; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions; -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_); -#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp5_); -#line 69 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 751 "DirectWindow.c" +#line 737 "DirectWindow.c" } @@ -759,50 +745,50 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = direct_window_get_direct_page (self); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_; -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = direct_photo_page_check_quit (_tmp1_); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = !_tmp2_; -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _g_object_unref0 (_tmp1_); -#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp3_) { -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 783 "DirectWindow.c" +#line 769 "DirectWindow.c" } -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) { -#line 787 "DirectWindow.c" +#line 773 "DirectWindow.c" GdkEventAny* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = event; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = _tmp6_; -#line 796 "DirectWindow.c" +#line 782 "DirectWindow.c" } else { -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = FALSE; -#line 800 "DirectWindow.c" +#line 786 "DirectWindow.c" } -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp4_; -#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 806 "DirectWindow.c" +#line 792 "DirectWindow.c" } @@ -811,29 +797,29 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent gboolean result = FALSE; GdkEventButton* _tmp0_ = NULL; GdkEventType _tmp1_ = 0; -#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = event; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_->type; -#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (_tmp1_ == GDK_2BUTTON_PRESS) { -#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 831 "DirectWindow.c" +#line 817 "DirectWindow.c" } -#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = FALSE; -#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 837 "DirectWindow.c" +#line 823 "DirectWindow.c" } @@ -844,48 +830,48 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey guint _tmp1_ = 0U; const gchar* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow); -#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp0_ = event; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp1_ = _tmp0_->keyval; -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (g_strcmp0 (_tmp2_, "Escape") == 0) { -#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)); -#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = TRUE; -#line 94 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 866 "DirectWindow.c" +#line 852 "DirectWindow.c" } -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) { -#line 870 "DirectWindow.c" +#line 856 "DirectWindow.c" GdkEventKey* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp4_ = event; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_); -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = _tmp5_; -#line 879 "DirectWindow.c" +#line 865 "DirectWindow.c" } else { -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" _tmp3_ = FALSE; -#line 883 "DirectWindow.c" +#line 869 "DirectWindow.c" } -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" result = _tmp3_; -#line 98 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" +#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" return result; -#line 889 "DirectWindow.c" +#line 875 "DirectWindow.c" } @@ -908,14 +894,14 @@ static void direct_window_class_init (DirectWindowClass * klass) { ((GtkWidgetClass *) klass)->key_press_event = direct_window_real_key_press_event; #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" G_OBJECT_CLASS (klass)->finalize = direct_window_finalize; -#line 912 "DirectWindow.c" +#line 898 "DirectWindow.c" } static void direct_window_instance_init (DirectWindow * self) { #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" self->priv = DIRECT_WINDOW_GET_PRIVATE (self); -#line 919 "DirectWindow.c" +#line 905 "DirectWindow.c" } @@ -927,7 +913,7 @@ static void direct_window_finalize (GObject* obj) { _g_object_unref0 (self->priv->direct_photo_page); #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala" G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj); -#line 931 "DirectWindow.c" +#line 917 "DirectWindow.c" } -- cgit v1.2.3