.gear/rules                                        |    4 +--

 .../tags/eb019414ff6d11b6b4081fcbb97c936f92125935  |    6 ++++

 .gear/tags/list                                    |    1 +

 configure.ac                                       |    1 -

 gossip.spec                                        |   32 ++++++++++++------

 src/gossip-notify.c                                |   34 ++++++++++++++++++++

 6 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/.gear/rules b/.gear/rules

index e2d5c22..4b0460c 100644

--- a/.gear/rules

+++ b/.gear/rules

@@ -1,2 +1,2 @@

-copy: *.patch

-tar.bz2: gossip

+tar: v@version@:.

+diff: v@version@:. .

diff --git a/.gear/tags/eb019414ff6d11b6b4081fcbb97c936f92125935 b/.gear/tags/eb019414ff6d11b6b4081fcbb97c936f92125935

new file mode 100644

index 0000000..5c82437

--- /dev/null

+++ b/.gear/tags/eb019414ff6d11b6b4081fcbb97c936f92125935

@@ -0,0 +1,6 @@

+object 71c5c4b97fb4abbfe32ba9b3c56701db753e85e7

+type commit

+tag v0.32

+tagger Alexey Shabalin <shaba@altlinux.org> 1242142329 +0400

+

+v0.32

diff --git a/.gear/tags/list b/.gear/tags/list

new file mode 100644

index 0000000..1d84992

--- /dev/null

+++ b/.gear/tags/list

@@ -0,0 +1 @@

+eb019414ff6d11b6b4081fcbb97c936f92125935 v0.32

diff --git a/configure.ac b/configure.ac

index 5400a77..505e547 100644

--- a/configure.ac

+++ b/configure.ac

@@ -295,7 +295,6 @@ PKG_CHECK_MODULES(GOSSIP_JABBER,

 if test x$have_dbus = xyes; then

    PKG_CHECK_MODULES(PEEKABOO, 

    [

-      libgnomeui-2.0

       libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

       gconf-2.0 >= $GCONF_REQUIRED

       glib-2.0 >= $GLIB_REQUIRED

diff --git a/gossip.spec b/gossip.spec

index b04403a..de7c11d 100644

--- a/gossip.spec

+++ b/gossip.spec

@@ -1,13 +1,14 @@

 Name: gossip

 Version: 0.32

-Release: alt1.git20090422

+Release: alt4.git20090422.1

 %def_enable dbus

 %def_enable libnotify

-%def_enable galago

+%def_disable galago

 %def_enable gnome_keyring

-%def_enable ebook

+%def_disable ebook

 %def_enable aspell

+%def_disable peekaboo

 Summary: Jabber client for GNOME

 Group: Networking/Instant messaging

@@ -45,14 +46,13 @@ BuildPreReq: libxml2-devel >= %libxml2_version

 BuildPreReq: glib2-devel >= %glib_version

 BuildPreReq: libgtk+2-devel >= %gtk_version

 BuildPreReq: libGConf-devel >= %gconf_version

-BuildPreReq: libgnome-panel-devel >= %panel_version

+%{?_enable_peekaboo:BuildPreReq: libgnome-panel-devel >= %panel_version}

 BuildPreReq: libglade-devel >= %libglade_version

-BuildPreReq: libgnome-devel >= %libgnome_version

 BuildPreReq: iso-codes-devel

 BuildPreReq: libgio-devel >= %gio_version

-BuildPreReq: libcanberra-devel >= %libcanberra_version 

+BuildPreReq: libcanberra-devel >= %libcanberra_version libcanberra-gtk2-devel

 BuildPreReq: libXScrnSaver-devel libXext-devel libX11-devel

-%{?_enable_dbus:BuildPreReq: libdbus-devel >= %dbus_version}

+%{?_enable_dbus:BuildPreReq: libdbus-devel >= %dbus_version libdbus-glib-devel}

 %{?_enable_libnotify:BuildPreReq: libnotify-devel >= %libnotify_version}

 %{?_enable_galago:BuildPreReq: libgalago-devel >= %galago_version}

 %{?_enable_gnome_keyring:BuildPreReq: libgnome-keyring-devel}

@@ -95,7 +95,8 @@ gnome-doc-prepare --copy --force

 	%{?_enable_gnome_keyring:--enable-gnome-keyring=yes} \

 	%{subst_enable ebook} \

 	--disable-schemas-install \

-	--disable-scrollkeeper

+	--disable-scrollkeeper \

+	--with-compile-warnings=yes

 %make_build

 %install

@@ -123,7 +124,7 @@ fi

 %doc --no-dereference COPYING

 %if_enabled dbus

-%if_enabled galago

+%if_enabled peekaboo

 %files peekaboo

 %_libexecdir/peekaboo-applet

 %_libdir/bonobo/servers/*

@@ -131,6 +132,19 @@ fi

 %endif

 %changelog

+* Wed Jul 18 2012 Eugeny A. Rostovtsev (REAL) <real at altlinux.org> 0.32-alt4.git20090422.1

+- Fixed build

+

+* Mon May 30 2011 Alexey Shabalin <shaba@altlinux.ru> 0.32-alt4.git20090422

+- fix build with libnotify-0.7

+

+* Fri May 27 2011 Alexey Shabalin <shaba@altlinux.ru> 0.32-alt3.git20090422

+- disable galago and ebook support

+- disable applet

+

+* Mon Oct 11 2010 Alexey Shabalin <shaba@altlinux.ru> 0.32-alt2.git20090422

+- rebuild with libebook-1.2.so.10

+

 * Tue May 12 2009 Alexey Shabalin <shaba@altlinux.ru> 0.32-alt1.git20090422

 - 0.32 git 20090422 version

 - update BuildRequires

diff --git a/src/gossip-notify.c b/src/gossip-notify.c

index f0baecd..ee421fb 100644

--- a/src/gossip-notify.c

+++ b/src/gossip-notify.c

@@ -217,7 +217,11 @@ notify_contact_online (GossipContact *contact)

 					gossip_contact_get_name (contact),

 					notify_get_default_status_from_presence (presence));

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	notify = notify_notification_new (_("Contact Online"), body, NULL, NULL);

+#else

+	notify = notify_notification_new (_("Contact Online"), body, NULL);

+#endif

 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_LOW);

 	notify_notification_set_icon_from_pixbuf (notify, pixbuf);

@@ -226,9 +230,11 @@ notify_contact_online (GossipContact *contact)

 			  G_CALLBACK (notify_closed_cb),

 			  NULL);

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	if (attach_status_icon) {

 		notify_notification_attach_to_status_icon (notify, attach_status_icon);

 	}

+#endif

 	notify_notification_add_action (notify, "default", _("Default"),

 					(NotifyActionCallback) notify_online_action_cb,

@@ -320,15 +326,23 @@ notify_subscription_request_show (GossipContact *contact)

 						     GTK_ICON_SIZE_MENU);

 	}

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	notify = notify_notification_new (_("Subscription Request"),

 					  message,

 					  NULL,

 					  NULL);

+#else

+	notify = notify_notification_new (_("Subscription Request"),

+					  message,

+					  NULL);

+#endif

 	g_free (message);

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	if (attach_status_icon) {

 		notify_notification_attach_to_status_icon (notify, attach_status_icon);

 	}

+#endif

 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);

 	notify_notification_set_timeout (notify, NOTIFY_SUBSCRIPTION_TIME);

@@ -367,16 +381,24 @@ notify_file_transfer_request (GossipFT *ft)

 	notification_body = g_markup_printf_escaped (_("%s would like to send you “%s”"),

 						     gossip_contact_get_name (gossip_ft_get_contact (ft)),

 						     gossip_ft_get_file_name (ft));

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	notification = notify_notification_new (_("File Transfer"),

 					  	notification_body,

 					  	NULL,

 					  	NULL);

+#else

+	notification = notify_notification_new (_("File Transfer"),

+					  	notification_body,

+					  	NULL);

+#endif

 	g_free (notification_body);

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	if (attach_status_icon) {

 		notify_notification_attach_to_status_icon (notification, attach_status_icon);

 	}

+#endif

 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);

@@ -540,7 +562,11 @@ notify_new_message (GossipEventManager *event_manager,

 		str = g_markup_printf_escaped (_("“%s”"), body_stripped);

 	}

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	notify = notify_notification_new (title, str, NULL, NULL);

+#else

+	notify = notify_notification_new (title, str, NULL);

+#endif

 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);

 	notify_notification_set_icon_from_pixbuf (notify, pixbuf);

 	notify_notification_set_timeout (notify, NOTIFY_MESSAGE_TIME);

@@ -550,9 +576,11 @@ notify_new_message (GossipEventManager *event_manager,

 			  G_CALLBACK (notify_closed_cb),

 			  NULL);

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	if (attach_status_icon) {

 		notify_notification_attach_to_status_icon (notify, attach_status_icon);

 	}

+#endif

 	notify_notification_add_action (notify, "default", _("Default"),

 					(NotifyActionCallback) notify_new_message_default_cb,

@@ -896,7 +924,11 @@ gossip_notify_hint_show (const gchar        *conf_path,

 		return FALSE;

 	}

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	notify = notify_notification_new (summary, message, NULL, NULL);

+#else

+	notify = notify_notification_new (summary, message, NULL);

+#endif

 	g_object_set_data_full (G_OBJECT (notify), "conf_path", g_strdup (conf_path), g_free);

 	g_object_set_data (G_OBJECT (notify), "func", func);

 	g_signal_connect (notify,

@@ -904,9 +936,11 @@ gossip_notify_hint_show (const gchar        *conf_path,

 			  G_CALLBACK (notify_hint_closed_cb),

 			  user_data);

+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)

 	if (attach_status_icon) {

 		notify_notification_attach_to_status_icon (notify, attach_status_icon);

 	}

+#endif

 	if (!notify_notification_show (notify, &error)) {

 		g_warning ("Failed to send notification: %s",