Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi, please unblock gnome-photos to fix an UI bug and a crasher. gnome-photos (3.14.2-1) unstable; urgency=medium [ Laurent Bigonville ] * debian/control.in: Only Recommends dleyna-renderer on linux architectures [ Josselin Mouette ] * New upstream translation and bugfix release. Attaching upstream diff (without translations) and Debian diff. unblock gnome-photos/3.14.2-1 Thanks, -- .''`. Josselin Mouette : :' : `. `' `-
diff --git a/NEWS b/NEWS index 58470ea..8663f5f 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,19 @@ +Overview of changes in 3.14.2 +============================= + +* Bugs fixed: + 737310 Ensure that icon-only buttons get the 'image-button' style class + 738527 Fix crash when reading scale factor after window has been destroyed + +* Updated translations: + Dutch + Friulian + Italian + Kazakh + Latvian + Persian + + Overview of changes in 3.14.0 ============================= diff --git a/configure.ac b/configure.ac index a4e3456..3f85049 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Photos], - [3.14.0], + [3.14.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-photos], [gnome-photos], [https://wiki.gnome.org/Apps/Photos]) diff --git a/po/LINGUAS b/po/LINGUAS index e4648cf..0baa369 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -16,6 +16,7 @@ eu fa fi fr +fur ga gd gl diff --git a/po/fa.po b/po/fa.po index 2222025..768777a 100644 diff --git a/po/fur.po b/po/fur.po new file mode 100644 index 0000000..be39ed5 diff --git a/po/it.po b/po/it.po index 6754002..9b74244 100644 diff --git a/po/kk.po b/po/kk.po index 6726f0b..28e37b2 100644 diff --git a/po/lv.po b/po/lv.po index 9204228..bc0d1cb 100644 diff --git a/po/nl.po b/po/nl.po index a0d83b1..3b6176f 100644 diff --git a/src/photos-application.c b/src/photos-application.c index 32044ff..f72ba26 100644 --- a/src/photos-application.c +++ b/src/photos-application.c @@ -1089,7 +1089,7 @@ gint photos_application_get_scale_factor (PhotosApplication *self) { GList *windows; - gint scale_factor; + gint ret_val = 1; /* We do not use priv->main_window to allow widgets to use this * method while they are being constructed. The widget hierarchy is @@ -1097,6 +1097,11 @@ photos_application_get_scale_factor (PhotosApplication *self) * priv->main_window is NULL. */ windows = gtk_application_get_windows (GTK_APPLICATION (self)); - scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (windows->data)); - return scale_factor; + if (windows == NULL) + goto out; + + ret_val = gtk_widget_get_scale_factor (GTK_WIDGET (windows->data)); + + out: + return ret_val; } diff --git a/src/photos-delete-notification.c b/src/photos-delete-notification.c index e10d9a8..7735d18 100644 --- a/src/photos-delete-notification.c +++ b/src/photos-delete-notification.c @@ -151,7 +151,7 @@ photos_delete_notification_constructed (GObject *object) gtk_widget_set_valign (close, GTK_ALIGN_CENTER); gtk_button_set_focus_on_click (GTK_BUTTON (close), FALSE); gtk_button_set_relief (GTK_BUTTON (close), GTK_RELIEF_NONE); - gtk_container_add (GTK_CONTAINER (close), image); + gtk_button_set_image (GTK_BUTTON (close), image); gtk_container_add (GTK_CONTAINER (self), close); g_signal_connect_swapped (close, "clicked", G_CALLBACK (photos_delete_notification_delete_items), self); diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c index 047bff3..b04f3db 100644 --- a/src/photos-indexing-notification.c +++ b/src/photos-indexing-notification.c @@ -297,7 +297,7 @@ photos_indexing_notification_init (PhotosIndexingNotification *self) close = gtk_button_new (); gtk_widget_set_valign (close, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (close), image); + gtk_button_set_image (GTK_BUTTON (close), image); gtk_container_add (GTK_CONTAINER (self), close); g_signal_connect_swapped (close, "clicked", G_CALLBACK (photos_indexing_notification_close_clicked), self); diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c index 1fc9307..999c34c 100644 --- a/src/photos-preview-nav-buttons.c +++ b/src/photos-preview-nav-buttons.c @@ -324,7 +324,7 @@ photos_preview_nav_buttons_constructed (GObject *object) gtk_image_set_pixel_size (GTK_IMAGE (image), 16); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_button_set_image (GTK_BUTTON (button), image); context = gtk_widget_get_style_context (button); gtk_style_context_add_class (context, "osd"); gtk_container_add (GTK_CONTAINER (priv->prev_widget), button); @@ -353,7 +353,7 @@ photos_preview_nav_buttons_constructed (GObject *object) gtk_image_set_pixel_size (GTK_IMAGE (image), 16); button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (button), image); + gtk_button_set_image (GTK_BUTTON (button), image); context = gtk_widget_get_style_context (button); gtk_style_context_add_class (context, "osd"); gtk_container_add (GTK_CONTAINER (priv->next_widget), button); diff --git a/src/photos-print-notification.c b/src/photos-print-notification.c index 97734ae..d886864 100644 --- a/src/photos-print-notification.c +++ b/src/photos-print-notification.c @@ -170,7 +170,7 @@ photos_print_notification_init (PhotosPrintNotification *self) priv->stop_button = gtk_button_new (); gtk_widget_set_valign (priv->stop_button, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (priv->stop_button), image); + gtk_button_set_image (GTK_BUTTON (priv->stop_button), image); gtk_container_add (GTK_CONTAINER (self), priv->stop_button); g_signal_connect_swapped (priv->stop_button, "clicked",
Index: debian/control.in =================================================================== --- debian/control.in (révision 43300) +++ debian/control.in (copie de travail) @@ -36,7 +36,7 @@ Package: gnome-photos Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, tracker, gnome-online-miners -Recommends: dleyna-renderer +Recommends: dleyna-renderer [linux-any] Description: application to access, organize and share your photos with GNOME GNOME Photos is designed to fullfill your needs to: . Index: debian/changelog =================================================================== --- debian/changelog (révision 43300) +++ debian/changelog (copie de travail) @@ -1,3 +1,13 @@ +gnome-photos (3.14.2-1) unstable; urgency=medium + + [ Laurent Bigonville ] + * debian/control.in: Only Recommends dleyna-renderer on linux architectures + + [ Josselin Mouette ] + * New upstream translation and bugfix release. + + -- Josselin Mouette <j...@debian.org> Fri, 05 Dec 2014 18:29:34 +0100 + gnome-photos (3.14.0-1) unstable; urgency=medium [ Jackson Doak ] Index: debian/control =================================================================== --- debian/control (révision 43300) +++ debian/control (copie de travail) @@ -6,7 +6,7 @@ Section: gnome Priority: extra Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org> -Uploaders: Andreas Henriksson <andr...@fatal.se>, Laurent Bigonville <bi...@debian.org> +Uploaders: Andreas Henriksson <andr...@fatal.se>, Josselin Mouette <j...@debian.org>, Laurent Bigonville <bi...@debian.org> Build-Depends: debhelper (>= 9), desktop-file-utils, dh-autoreconf, @@ -40,7 +40,7 @@ Package: gnome-photos Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, tracker, gnome-online-miners -Recommends: dleyna-renderer +Recommends: dleyna-renderer [linux-any] Description: application to access, organize and share your photos with GNOME GNOME Photos is designed to fullfill your needs to: .