Hello community, here is the log from the commit of package notification-daemon for openSUSE:Factory checked in at 2015-03-30 19:14:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notification-daemon (Old) and /work/SRC/openSUSE:Factory/.notification-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "notification-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/notification-daemon/notification-daemon.changes 2015-01-30 23:57:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.notification-daemon.new/notification-daemon.changes 2015-03-30 19:15:00.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jan 29 11:22:43 UTC 2015 - dimstar@opensuse.org + +- Update to version 3.15.2: + + Fix few deprecation warnings. + +------------------------------------------------------------------- Old: ---- notification-daemon-3.14.1.tar.xz New: ---- notification-daemon-3.15.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notification-daemon.spec ++++++ --- /var/tmp/diff_new_pack.SzuQtc/_old 2015-03-30 19:15:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SzuQtc/_new 2015-03-30 19:15:01.000000000 +0200 @@ -17,18 +17,18 @@ Name: notification-daemon -Version: 3.14.1 +Version: 3.15.2 Release: 0 Summary: Notification Daemon License: GPL-2.0+ Group: System/Daemons Url: http://www.galago-project.org/ -Source: http://download.gnome.org/sources/notification-daemon/3.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/notification-daemon/3.15/%{name}-%{version}.tar.xz BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.2 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(x11) Recommends: %{name}-lang ++++++ notification-daemon-3.14.1.tar.xz -> notification-daemon-3.15.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/Makefile.am new/notification-daemon-3.15.2/Makefile.am --- old/notification-daemon-3.14.1/Makefile.am 2014-11-24 19:32:06.000000000 +0100 +++ new/notification-daemon-3.15.2/Makefile.am 2014-11-24 20:11:06.000000000 +0100 @@ -7,39 +7,35 @@ AUTHORS NEWS INSTALL COPYING README \ ChangeLog \ autogen.sh \ - configure.ac \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in + configure.ac $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/compile \ - $(srcdir)/config.guess \ - $(srcdir)/config.h.in \ - $(srcdir)/config.sub \ - $(srcdir)/configure.scan \ - $(srcdir)/depcomp \ - $(srcdir)/install-sh \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - $(srcdir)/mkinstalldirs \ - $(srcdir)/omf.make \ - $(srcdir)/xmldocs.make \ - $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog \ - `find "$(srcdir)" -type f -name Makefile.in -print` - + $(srcdir)/INSTALL \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/compile \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.h.in~ \ + $(srcdir)/config.sub \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs \ + `find "$(srcdir)" -type f -name Makefile.in -print` \ + $(srcdir)/configure \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/macros/gtk-doc.m4 \ + $(srcdir)/macros/intltool.m4 \ + $(srcdir)/macros/libtool.m4 \ + $(srcdir)/macros/ltoptions.m4 \ + $(srcdir)/macros/ltsugar.m4 \ + $(srcdir)/macros/ltversion.m4 \ + $(srcdir)/macros/lt~obsolete.m4 +GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz} -include $(top_srcdir)/git.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/Makefile.in new/notification-daemon-3.15.2/Makefile.in --- old/notification-daemon-3.14.1/Makefile.in 2014-11-24 19:54:11.000000000 +0100 +++ new/notification-daemon-3.15.2/Makefile.in 2014-11-29 14:32:55.000000000 +0100 @@ -366,36 +366,33 @@ AUTHORS NEWS INSTALL COPYING README \ ChangeLog \ autogen.sh \ - configure.ac \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update + configure.ac MAINTAINERCLEANFILES = \ - $(srcdir)/INSTALL \ - $(srcdir)/aclocal.m4 \ - $(srcdir)/autoscan.log \ - $(srcdir)/compile \ - $(srcdir)/config.guess \ - $(srcdir)/config.h.in \ - $(srcdir)/config.sub \ - $(srcdir)/configure.scan \ - $(srcdir)/depcomp \ - $(srcdir)/install-sh \ - $(srcdir)/ltmain.sh \ - $(srcdir)/missing \ - $(srcdir)/mkinstalldirs \ - $(srcdir)/omf.make \ - $(srcdir)/xmldocs.make \ - $(srcdir)/gtk-doc.make \ - $(srcdir)/ChangeLog \ - `find "$(srcdir)" -type f -name Makefile.in -print` + $(srcdir)/INSTALL \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/compile \ + $(srcdir)/config.guess \ + $(srcdir)/config.h.in \ + $(srcdir)/config.h.in~ \ + $(srcdir)/config.sub \ + $(srcdir)/depcomp \ + $(srcdir)/install-sh \ + $(srcdir)/ltmain.sh \ + $(srcdir)/missing \ + $(srcdir)/mkinstalldirs \ + `find "$(srcdir)" -type f -name Makefile.in -print` \ + $(srcdir)/configure \ + $(srcdir)/gtk-doc.make \ + $(srcdir)/macros/gtk-doc.m4 \ + $(srcdir)/macros/intltool.m4 \ + $(srcdir)/macros/libtool.m4 \ + $(srcdir)/macros/ltoptions.m4 \ + $(srcdir)/macros/ltsugar.m4 \ + $(srcdir)/macros/ltversion.m4 \ + $(srcdir)/macros/lt~obsolete.m4 +GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz} all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -783,7 +780,6 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -882,7 +878,6 @@ $(OBJECTS): libtool libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck - -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/NEWS new/notification-daemon-3.15.2/NEWS --- old/notification-daemon-3.14.1/NEWS 2014-11-24 19:53:08.000000000 +0100 +++ new/notification-daemon-3.15.2/NEWS 2014-11-29 14:32:07.000000000 +0100 @@ -1,3 +1,7 @@ +Version 3.15.2 +============== +- Fix few deprecation warnings. (Alberts Muktupāvels) + Version 3.14.1 ============== - Rename existing .desktop file to notification-daemon-autostart.desktop and add diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/configure new/notification-daemon-3.15.2/configure --- old/notification-daemon-3.14.1/configure 2014-11-24 19:54:12.000000000 +0100 +++ new/notification-daemon-3.15.2/configure 2014-11-29 14:32:54.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for notification-daemon 3.14.1. +# Generated by GNU Autoconf 2.69 for notification-daemon 3.15.2. # # Report bugs to https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='notification-daemon' PACKAGE_TARNAME='notification-daemon' -PACKAGE_VERSION='3.14.1' -PACKAGE_STRING='notification-daemon 3.14.1' +PACKAGE_VERSION='3.15.2' +PACKAGE_STRING='notification-daemon 3.15.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon' PACKAGE_URL='' @@ -1392,7 +1392,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures notification-daemon 3.14.1 to adapt to many kinds of systems. +\`configure' configures notification-daemon 3.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1463,7 +1463,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of notification-daemon 3.14.1:";; + short | recursive ) echo "Configuration of notification-daemon 3.15.2:";; esac cat <<\_ACEOF @@ -1591,7 +1591,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -notification-daemon configure 3.14.1 +notification-daemon configure 3.15.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2014,7 +2014,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by notification-daemon $as_me 3.14.1, which was +It was created by notification-daemon $as_me 3.15.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2884,7 +2884,7 @@ # Define the identity of the package. PACKAGE='notification-daemon' - VERSION='3.14.1' + VERSION='3.15.2' cat >>confdefs.h <<_ACEOF @@ -13021,7 +13021,7 @@ -REQ_GTK_VERSION=3.8.0 +REQ_GTK_VERSION=3.15.2 REQ_GLIB_VERSION=2.27.0 REQ_LIBCANBERRA_GTK_VERSION=0.4 pkg_modules=" @@ -14199,7 +14199,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by notification-daemon $as_me 3.14.1, which was +This file was extended by notification-daemon $as_me 3.15.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14265,7 +14265,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -notification-daemon config.status 3.14.1 +notification-daemon config.status 3.15.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/configure.ac new/notification-daemon-3.15.2/configure.ac --- old/notification-daemon-3.14.1/configure.ac 2014-11-24 19:49:52.000000000 +0100 +++ new/notification-daemon-3.15.2/configure.ac 2014-11-29 14:29:26.000000000 +0100 @@ -3,7 +3,7 @@ dnl ################################################################ dnl # Initialize autoconf dnl ################################################################ -AC_INIT([notification-daemon],[3.14.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon],[notification-daemon]) +AC_INIT([notification-daemon],[3.15.2],[https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon],[notification-daemon]) AC_PREREQ(2.63) AC_CONFIG_HEADERS([config.h]) @@ -50,7 +50,7 @@ dnl --------------------------------------------------------------------------- dnl Requirements for the daemon dnl --------------------------------------------------------------------------- -REQ_GTK_VERSION=3.8.0 +REQ_GTK_VERSION=3.15.2 REQ_GLIB_VERSION=2.27.0 REQ_LIBCANBERRA_GTK_VERSION=0.4 pkg_modules=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/src/nd-bubble.c new/notification-daemon-3.15.2/src/nd-bubble.c --- old/notification-daemon-3.14.1/src/nd-bubble.c 2014-11-24 19:32:06.000000000 +0100 +++ new/notification-daemon-3.15.2/src/nd-bubble.c 2014-11-29 13:39:08.000000000 +0100 @@ -529,7 +529,6 @@ GtkWidget *image; GtkWidget *alignment; AtkObject *atkobj; - GtkRcStyle *rcstyle; GdkScreen *screen; GdkVisual *visual; @@ -555,7 +554,7 @@ bubble->priv->composited = TRUE; } - main_vbox = gtk_vbox_new (FALSE, 0); + main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_signal_connect (G_OBJECT (main_vbox), "style-set", G_CALLBACK (on_style_set), @@ -564,7 +563,7 @@ gtk_container_add (GTK_CONTAINER (bubble), main_vbox); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - bubble->priv->main_hbox = gtk_hbox_new (FALSE, 0); + bubble->priv->main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (bubble->priv->main_hbox); gtk_box_pack_start (GTK_BOX (main_vbox), bubble->priv->main_hbox, @@ -584,7 +583,7 @@ gtk_widget_show (bubble->priv->icon); gtk_container_add (GTK_CONTAINER (bubble->priv->iconbox), bubble->priv->icon); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (bubble->priv->main_hbox), vbox, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); @@ -609,18 +608,13 @@ G_CALLBACK (on_close_button_clicked), bubble); - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (close_button, rcstyle); - g_object_unref (rcstyle); - atkobj = gtk_widget_get_accessible (close_button); atk_action_set_description (ATK_ACTION (atkobj), 0, "Closes the notification."); atk_object_set_name (atkobj, ""); atk_object_set_description (atkobj, "Closes the notification."); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_container_add (GTK_CONTAINER (close_button), image); @@ -632,19 +626,20 @@ bubble); gtk_widget_show (bubble->priv->summary_label); gtk_box_pack_start (GTK_BOX (vbox), bubble->priv->summary_label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (bubble->priv->summary_label), 0, 0); + gtk_label_set_xalign (GTK_LABEL (bubble->priv->summary_label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bubble->priv->summary_label), 0.0); gtk_label_set_line_wrap (GTK_LABEL (bubble->priv->summary_label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (bubble->priv->summary_label), PANGO_WRAP_WORD_CHAR); atkobj = gtk_widget_get_accessible (bubble->priv->summary_label); atk_object_set_description (atkobj, "Notification summary text."); - bubble->priv->content_hbox = gtk_hbox_new (FALSE, 6); + bubble->priv->content_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (bubble->priv->content_hbox); gtk_box_pack_start (GTK_BOX (vbox), bubble->priv->content_hbox, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (bubble->priv->content_hbox), vbox, TRUE, TRUE, 0); @@ -655,7 +650,8 @@ bubble); gtk_widget_show (bubble->priv->body_label); gtk_box_pack_start (GTK_BOX (vbox), bubble->priv->body_label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (bubble->priv->body_label), 0, 0); + gtk_label_set_xalign (GTK_LABEL (bubble->priv->body_label), 0.0); + gtk_label_set_yalign (GTK_LABEL (bubble->priv->body_label), 0.0); gtk_label_set_line_wrap (GTK_LABEL (bubble->priv->body_label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (bubble->priv->body_label), PANGO_WRAP_WORD_CHAR); g_signal_connect (bubble->priv->body_label, @@ -670,7 +666,7 @@ gtk_widget_show (alignment); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 0); - bubble->priv->actions_box = gtk_hbox_new (FALSE, 6); + bubble->priv->actions_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (bubble->priv->actions_box); gtk_container_add (GTK_CONTAINER (alignment), bubble->priv->actions_box); } @@ -739,7 +735,7 @@ } update_content_hbox_visibility (bubble); - gtk_widget_size_request (bubble->priv->close_button, &req); + gtk_widget_get_preferred_size (bubble->priv->close_button, NULL, &req); /* -1: main_vbox border width -10: vbox border width -6: spacing for hbox */ @@ -877,7 +873,7 @@ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_container_set_border_width (GTK_CONTAINER (button), 0); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (button), hbox); @@ -904,7 +900,8 @@ text); gtk_widget_show (image); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5); + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (image, GTK_ALIGN_CENTER); } else { GtkWidget *label; @@ -915,7 +912,7 @@ bubble); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); buf = g_strdup_printf ("<small>%s</small>", text); gtk_label_set_markup (GTK_LABEL (label), buf); g_free (buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/src/nd-notification-box.c new/notification-daemon-3.15.2/src/nd-notification-box.c --- old/notification-daemon-3.14.1/src/nd-notification-box.c 2014-11-24 19:32:06.000000000 +0100 +++ new/notification-daemon-3.15.2/src/nd-notification-box.c 2014-11-29 14:28:18.000000000 +0100 @@ -120,7 +120,7 @@ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_container_set_border_width (GTK_CONTAINER (button), 0); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (button), hbox); @@ -143,14 +143,15 @@ text); gtk_widget_show (image); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5); + gtk_widget_set_halign (image, GTK_ALIGN_CENTER); + gtk_widget_set_valign (image, GTK_ALIGN_CENTER); } else { GtkWidget *label; label = gtk_label_new (NULL); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label), 0.0); buf = g_strdup_printf ("<small>%s</small>", text); gtk_label_set_markup (GTK_LABEL (label), buf); g_free (buf); @@ -210,7 +211,7 @@ gtk_label_set_markup (GTK_LABEL (notification_box->priv->summary_label), str); g_free (str); - gtk_widget_size_request (notification_box->priv->close_button, &req); + gtk_widget_get_preferred_size (notification_box->priv->close_button, NULL, &req); /* -1: main_vbox border width -10: vbox border width -6: spacing for hbox */ @@ -274,10 +275,9 @@ GtkWidget *vbox; GtkWidget *alignment; AtkObject *atkobj; - GtkRcStyle *rcstyle; notification_box->priv = ND_NOTIFICATION_BOX_GET_PRIVATE (notification_box); - box = gtk_hbox_new (FALSE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (notification_box), box); gtk_widget_show (box); @@ -295,7 +295,7 @@ gtk_widget_show (notification_box->priv->icon); gtk_container_add (GTK_CONTAINER (iconbox), notification_box->priv->icon); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (box), vbox, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); @@ -315,18 +315,13 @@ G_CALLBACK (on_close_button_clicked), notification_box); - rcstyle = gtk_rc_style_new (); - rcstyle->xthickness = rcstyle->ythickness = 0; - gtk_widget_modify_style (notification_box->priv->close_button, rcstyle); - g_object_unref (rcstyle); - atkobj = gtk_widget_get_accessible (notification_box->priv->close_button); atk_action_set_description (ATK_ACTION (atkobj), 0, "Closes the notification."); atk_object_set_name (atkobj, ""); atk_object_set_description (atkobj, "Closes the notification."); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_widget_show (image); gtk_container_add (GTK_CONTAINER (notification_box->priv->close_button), image); @@ -334,18 +329,19 @@ notification_box->priv->summary_label = gtk_label_new (NULL); gtk_widget_show (notification_box->priv->summary_label); gtk_box_pack_start (GTK_BOX (vbox), notification_box->priv->summary_label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (notification_box->priv->summary_label), 0, 0); + gtk_label_set_xalign (GTK_LABEL (notification_box->priv->summary_label), 0.0); + gtk_label_set_yalign (GTK_LABEL (notification_box->priv->summary_label), 0.0); gtk_label_set_line_wrap (GTK_LABEL (notification_box->priv->summary_label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (notification_box->priv->summary_label), PANGO_WRAP_WORD_CHAR); atkobj = gtk_widget_get_accessible (notification_box->priv->summary_label); atk_object_set_description (atkobj, "Notification summary text."); - notification_box->priv->content_hbox = gtk_hbox_new (FALSE, 6); + notification_box->priv->content_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (notification_box->priv->content_hbox); gtk_box_pack_start (GTK_BOX (vbox), notification_box->priv->content_hbox, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (notification_box->priv->content_hbox), vbox, TRUE, TRUE, 0); @@ -353,7 +349,8 @@ notification_box->priv->body_label = gtk_label_new (NULL); gtk_widget_show (notification_box->priv->body_label); gtk_box_pack_start (GTK_BOX (vbox), notification_box->priv->body_label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (notification_box->priv->body_label), 0, 0); + gtk_label_set_xalign (GTK_LABEL (notification_box->priv->body_label), 0.0); + gtk_label_set_yalign (GTK_LABEL (notification_box->priv->body_label), 0.0); gtk_label_set_line_wrap (GTK_LABEL (notification_box->priv->body_label), TRUE); gtk_label_set_line_wrap_mode (GTK_LABEL (notification_box->priv->body_label), PANGO_WRAP_WORD_CHAR); @@ -364,7 +361,7 @@ gtk_widget_show (alignment); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, TRUE, 0); - notification_box->priv->actions_box = gtk_hbox_new (FALSE, 6); + notification_box->priv->actions_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (notification_box->priv->actions_box); gtk_container_add (GTK_CONTAINER (alignment), notification_box->priv->actions_box); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notification-daemon-3.14.1/src/nd-queue.c new/notification-daemon-3.15.2/src/nd-queue.c --- old/notification-daemon-3.14.1/src/nd-queue.c 2014-11-24 19:32:06.000000000 +0100 +++ new/notification-daemon-3.15.2/src/nd-queue.c 2014-11-29 13:18:22.000000000 +0100 @@ -57,8 +57,7 @@ GtkWidget *dock; GtkWidget *dock_scrolled_window; - NotifyScreen **screens; - int n_screens; + NotifyScreen *screen; guint update_id; }; @@ -88,10 +87,8 @@ int monitor_num) { NotifyScreen *nscreen; - int screen_num; - screen_num = gdk_screen_get_number (screen); - nscreen = queue->priv->screens[screen_num]; + nscreen = queue->priv->screen; nscreen->stacks[monitor_num] = nd_stack_new (screen, monitor_num); @@ -102,12 +99,10 @@ NdQueue *queue) { NotifyScreen *nscreen; - int screen_num; int n_monitors; int i; - screen_num = gdk_screen_get_number (screen); - nscreen = queue->priv->screens[screen_num]; + nscreen = queue->priv->screen; n_monitors = gdk_screen_get_n_monitors (screen); @@ -161,11 +156,9 @@ GdkScreen *screen) { NotifyScreen *nscreen; - int screen_num; int i; - screen_num = gdk_screen_get_number (screen); - nscreen = queue->priv->screens[screen_num]; + nscreen = queue->priv->screen; nscreen->n_stacks = gdk_screen_get_n_monitors (screen); @@ -200,37 +193,30 @@ } static void -create_screens (NdQueue *queue) +create_screen (NdQueue *queue) { - GdkDisplay *display; - int i; + GdkDisplay *display; + GdkScreen *screen; + GdkWindow *gdkwindow; - g_assert (queue->priv->screens == NULL); + g_assert (queue->priv->screen == NULL); display = gdk_display_get_default (); - queue->priv->n_screens = gdk_display_get_n_screens (display); - - queue->priv->screens = g_new0 (NotifyScreen *, queue->priv->n_screens); - - for (i = 0; i < queue->priv->n_screens; i++) { - GdkScreen *screen; - GdkWindow *gdkwindow; + screen = gdk_display_get_default_screen (display); - screen = gdk_display_get_screen (display, i); - g_signal_connect (screen, - "monitors-changed", - G_CALLBACK (on_screen_monitors_changed), - queue); + g_signal_connect (screen, + "monitors-changed", + G_CALLBACK (on_screen_monitors_changed), + queue); - queue->priv->screens[i] = g_new0 (NotifyScreen, 1); + queue->priv->screen = g_new0 (NotifyScreen, 1); + queue->priv->screen->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "_NET_WORKAREA", True); - queue->priv->screens[i]->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "_NET_WORKAREA", True); - gdkwindow = gdk_screen_get_root_window (screen); - gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, queue->priv->screens[i]); - gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK); + gdkwindow = gdk_screen_get_root_window (screen); + gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, queue->priv->screen); + gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK); - create_stacks_for_screen (queue, gdk_display_get_screen (display, i)); - } + create_stacks_for_screen (queue, screen); } static void @@ -346,17 +332,14 @@ static void clear_stacks (NdQueue *queue) { - int i; - int j; + NotifyScreen *nscreen; + gint i; - for (i = 0; i < queue->priv->n_screens; i++) { - NotifyScreen *nscreen; - nscreen = queue->priv->screens[i]; - for (j = 0; j < nscreen->n_stacks; j++) { - NdStack *stack; - stack = nscreen->stacks[j]; - nd_stack_remove_all (stack); - } + nscreen = queue->priv->screen; + for (i = 0; i < nscreen->n_stacks; i++) { + NdStack *stack; + stack = nscreen->stacks[i]; + nd_stack_remove_all (stack); } } @@ -456,7 +439,7 @@ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_container_add (GTK_CONTAINER (queue->priv->dock), frame); - box = gtk_vbox_new (FALSE, 6); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 2); gtk_container_add (GTK_CONTAINER (frame), box); @@ -484,39 +467,35 @@ queue->priv->status_icon = NULL; create_dock (queue); - create_screens (queue); + create_screen (queue); } static void -destroy_screens (NdQueue *queue) +destroy_screen (NdQueue *queue) { - GdkDisplay *display; - int i; - int j; + GdkDisplay *display; + GdkScreen *screen; + GdkWindow *gdkwindow; + gint i; display = gdk_display_get_default (); + screen = gdk_display_get_default_screen (display); - for (i = 0; i < queue->priv->n_screens; i++) { - GdkScreen *screen; - GdkWindow *gdkwindow; - - screen = gdk_display_get_screen (display, i); - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (on_screen_monitors_changed), - queue); - - gdkwindow = gdk_screen_get_root_window (screen); - gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, queue->priv->screens[i]); - for (j = 0; j < queue->priv->screens[i]->n_stacks; j++) { - g_object_unref (queue->priv->screens[i]->stacks[j]); - queue->priv->screens[i]->stacks[j] = NULL; - } + g_signal_handlers_disconnect_by_func (screen, + G_CALLBACK (on_screen_monitors_changed), + queue); - g_free (queue->priv->screens[i]->stacks); + gdkwindow = gdk_screen_get_root_window (screen); + gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, queue->priv->screen); + for (i = 0; i < queue->priv->screen->n_stacks; i++) { + g_clear_object (&queue->priv->screen->stacks[i]); } - g_free (queue->priv->screens); - queue->priv->screens = NULL; + g_free (queue->priv->screen->stacks); + queue->priv->screen->stacks = NULL; + + g_free (queue->priv->screen); + queue->priv->screen = NULL; } @@ -539,7 +518,7 @@ g_hash_table_destroy (queue->priv->notifications); g_queue_free (queue->priv->queue); - destroy_screens (queue); + destroy_screen (queue); if (queue->priv->numerable_icon != NULL) { g_object_unref (queue->priv->numerable_icon); @@ -574,7 +553,6 @@ { GdkScreen *screen; int x, y; - int screen_num; int monitor_num; gdk_display_get_pointer (gdk_display_get_default (), @@ -582,16 +560,15 @@ &x, &y, NULL); - screen_num = gdk_screen_get_number (screen); monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); - if (monitor_num >= queue->priv->screens[screen_num]->n_stacks) { + if (monitor_num >= queue->priv->screen->n_stacks) { /* screw it - dump it on the last one we'll get a monitors-changed signal soon enough*/ - monitor_num = queue->priv->screens[screen_num]->n_stacks - 1; + monitor_num = queue->priv->screen->n_stacks - 1; } - return queue->priv->screens[screen_num]->stacks[monitor_num]; + return queue->priv->screen->stacks[monitor_num]; } static void @@ -685,7 +662,7 @@ if (child != NULL) gtk_container_remove (GTK_CONTAINER (queue->priv->dock_scrolled_window), child); - child = gtk_vbox_new (FALSE, 6); + child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (queue->priv->dock_scrolled_window), child); gtk_container_set_focus_hadjustment (GTK_CONTAINER (child),