debian/0000755000000000000000000000000011732735637007204 5ustar debian/watch0000644000000000000000000000010710725050046010214 0ustar version=3 http://sf.net/gaim-libnotify/ pidgin-libnotify-(.*)\.tar\.gz debian/rules0000755000000000000000000000064211732734115010254 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/autoreconf.mk DEB_CONFIGURE_EXTRA_FLAGS := --disable-static DEB_DH_MAKESHLIBS_ARGS := -Xpidgin-libnotify install/pidgin-libnotify:: dh_pidgin -ppidgin-libnotify find $(DEB_DESTDIR) -iname "pidgin-libnotify.la" -delete get-orig-source: uscan --force-download --rename debian/copyright0000644000000000000000000000425311201357465011131 0ustar This package was debianized by Varun Hiremath on Sat, 18 Nov 2006 00:46:10 +0530. It was downloaded from Upstream Author: Duarte Henriques Copyright: © 2005-2006 Duarte Henriques Copyright Translations: © 2005 Ezequiel Prez © 2005 Ersplus © 2006 Marco Cabizza © 2006 Raymond Jelierse © 2006 Krzysztof Rosiski © 2006 Everson Araujo © 2005-2006 Duarte Henriques License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. On Debian systems, you can find the GPL license in: /usr/share/common-licenses/GPL ------- The files in intl/* are copyright: © 1995-2001 Free Software Foundation, Inc. Some of the files are contributed by: Ulrich Drepper , 1995. The files are licensed as follows: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. On Debian systems, you can find the Library GPL license in: /usr/share/common-licenses/LGPL-2 The Debian packaging is © 2006, Varun Hiremath and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. debian/source/0000755000000000000000000000000011732735003010467 5ustar debian/source/format0000644000000000000000000000001411327112627011676 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000001073711732734515011060 0ustar pidgin-libnotify (0.14-8) unstable; urgency=low * debian/rules: include autoreconf.mk (Closes: #657920) * debian/control: Build-Depend on dh-autoreconf -- Varun Hiremath Thu, 22 Mar 2012 19:40:23 -0400 pidgin-libnotify (0.14-7) unstable; urgency=low * debian/patches: - replace-pidgin-action-requests.diff, use libnotify (Closes: #640728) - transient-hint-on-event-notifications.diff, use "transient" hint for event notifications (Closes: #640835) -- Varun Hiremath Tue, 24 Jan 2012 17:11:58 -0500 pidgin-libnotify (0.14-6) unstable; urgency=low * debian/patches - chat-nick-test-optional.diff, make nick presence optional (Closes: #638901) - fix-printf-warnings.diff , fix compiler warnings (Closes: #638899) - fix-notify-osd.diff, fix notify issues (Closes: #635614, #549265) - add-cs-translation.diff, add Czech translation (Closes: #638902) * Thanks to Jakub Adam for providing the above patches -- Varun Hiremath Fri, 26 Aug 2011 23:35:52 -0400 pidgin-libnotify (0.14-5) unstable; urgency=low * Add patches/fix-libnotify0.7-compatibility.diff to add compatibility with libnotify 0.7, thanks to Jérémy Bobbio (Closes: #630295) * Remove unneeded pidgin-libnotify.la file (Closes: #633288) * Bump Standards-Version to 3.9.2 -- Varun Hiremath Wed, 20 Jul 2011 20:34:48 -0400 pidgin-libnotify (0.14-4) unstable; urgency=low * Swicth to source format 3.0 * Bum Standards-Version to 3.8.3 * Add patch fix-notify-osd.diff to disable show button for working with notify-osd, thanks to Lubomír Sedlár * Add it_po.diff to update Italian translation, thanks to Milo Casagrande (Closes: #555789) -- Varun Hiremath Sun, 24 Jan 2010 13:25:57 -0500 pidgin-libnotify (0.14-3) unstable; urgency=low * Add de_po.diff patch to fix a German translation, thanks to Jürgen Göricke (Closes: #522952) -- Varun Hiremath Sat, 09 May 2009 15:39:47 -0400 pidgin-libnotify (0.14-2) unstable; urgency=low * upload to unstable -- Torsten Werner Sun, 15 Feb 2009 22:45:55 +0100 pidgin-libnotify (0.14-1) experimental; urgency=low * New upstream release * Bump up Standards-Version: 3.8.0. -- Torsten Werner Sun, 28 Dec 2008 17:52:00 +0100 pidgin-libnotify (0.13-2) unstable; urgency=low * Add patches/show_button_fix.diff to fix issues with the show button in the notification window (Closes: #456218) * debian/control: + Add quilt to Build-Depends + Update Standards-Version to 3.7.3 -- Varun Hiremath Mon, 17 Dec 2007 16:26:02 +0530 pidgin-libnotify (0.13-1) unstable; urgency=low [ Varun Hiremath ] * New upstream release * debian/control: + Add Homepage header and rename XS-Vcs to Vcs + Remove gaim-libnotify transition package * Fix watch file. * Remove old patches - no longer required. [ Torsten Werner ] * Do not run automake + autoconf and remove the Build-Depends. * Build with pidgin-dev 2.3.0. (Closes: #454170) -- Torsten Werner Tue, 04 Dec 2007 07:03:40 +0100 pidgin-libnotify (0.12-4) unstable; urgency=low * debian/rules: call dh_pidgin and remove duplicate-relation depends: pidgin (>= 2.0), pidgin (<< 3.0) from debian/control -- Varun Hiremath Thu, 09 Aug 2007 23:23:58 +0530 pidgin-libnotify (0.12-3) unstable; urgency=low * debian/control: Add Depends: pidgin (>= 2.0), pidgin (<< 3.0) to avoid breaking when upgraded to pidgin 3.0 (Closes: #433407) -- Varun Hiremath Tue, 17 Jul 2007 10:30:13 +0530 pidgin-libnotify (0.12-2) unstable; urgency=low * Switch to pidgin. (Closes: #424685) * Rename the package to pidgin-libnotify and add a dummy package to ease upgrades. * Add NEWS.Debian to explain the transition. * Implement get-orig-source as suggested by the Debian policy. -- Torsten Werner Sun, 20 May 2007 13:26:57 +0200 gaim-libnotify (0.12-1) unstable; urgency=low [ Varun Hiremath ] * Initial release (Closes: #359955) [ Torsten Werner ] * Disable static library creation because it cannot be used. * Add myself to Uploaders in debian/control. * Add XS-X-Vcs-Svn header in debian/control. -- Torsten Werner Mon, 20 Nov 2006 06:45:09 +0100 debian/docs0000644000000000000000000000002110530036131010022 0ustar NEWS README TODO debian/patches/0000755000000000000000000000000011732735003010616 5ustar debian/patches/fix-libnotify0.7-compatibility.diff0000644000000000000000000000162311611671761017337 0ustar Description: Add compatibility with libnotify 0.7 Author: Jérémy Bobbio Bug-Debian: http://bugs.debian.org/630295 --- pidgin-libnotify-0.14.orig/src/pidgin-libnotify.c +++ pidgin-libnotify-0.14/src/pidgin-libnotify.c @@ -38,6 +38,10 @@ #include +#ifndef NOTIFY_CHECK_VERSION +#define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif + #include #define PLUGIN_ID "pidgin-libnotify" @@ -286,7 +290,12 @@ notify (const gchar *title, g_free (tr_body); return; } +/* libnotify 0.7.0 and later has no support for attaching to widgets */ +#if NOTIFY_CHECK_VERSION(0,7,0) + notification = notify_notification_new (title, tr_body, NULL); +#else notification = notify_notification_new (title, tr_body, NULL, NULL); +#endif purple_debug_info (PLUGIN_ID, "notify(), new: " "title: '%s', body: '%s', buddy: '%s'\n", title, tr_body, best_name (buddy)); debian/patches/transient-hint-on-event-notifications.diff0000644000000000000000000000156011707627750021034 0ustar From 09e785724200120776a418566c5e8630d7afda36 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Wed, 7 Sep 2011 21:47:22 +0200 Subject: [PATCH] Set "transient" hint on event notifications It is better to remove them automatically from the stack than forcing user to clear them manually whenever new message arrives. --- src/pidgin-libnotify.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/pidgin-libnotify.c b/src/pidgin-libnotify.c index 161f8f9..bd603e3 100644 --- a/src/pidgin-libnotify.c +++ b/src/pidgin-libnotify.c @@ -338,6 +338,9 @@ notify (const gchar *title, notify_notification_add_action (notification, "show", _("Show"), action_cb, NULL, NULL); } + notify_notification_set_hint (notification, "transient", + g_variant_new_boolean (TRUE)); + notification_show (notification); } -- 1.7.5.4 debian/patches/show_button_fix.diff0000644000000000000000000000125011201357465014672 0ustar Author: Varun Hiremath Description: Fixes issue with the show button in the notification window. Index: pidgin-libnotify-0.13/src/pidgin-libnotify.c =================================================================== --- pidgin-libnotify-0.13.orig/src/pidgin-libnotify.c 2007-12-17 16:23:46.000000000 +0530 +++ pidgin-libnotify-0.13/src/pidgin-libnotify.c 2007-12-17 16:24:19.000000000 +0530 @@ -307,6 +307,7 @@ g_hash_table_insert (buddy_hash, contact, notification); g_object_set_data (G_OBJECT(notification), "contact", contact); + g_object_set_data (G_OBJECT(notification), "buddy", buddy); g_signal_connect (notification, "closed", G_CALLBACK(closed_cb), NULL); debian/patches/add-cs-translation.diff0000644000000000000000000000571711626064444015157 0ustar From: Jakub Adam Date: Mon, 22 Aug 2011 22:17:16 +0200 Subject: add-cs-translation.diff --- configure.ac | 2 +- po/cs.po | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletions(-) create mode 100644 po/cs.po diff --git a/configure.ac b/configure.ac index 8bf8d78..3dc90db 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ AH_BOTTOM([ AC_PROG_INTLTOOL GETTEXT_PACKAGE=pidgin-libnotify AC_SUBST(GETTEXT_PACKAGE) -ALL_LINGUAS="es fr it nl pl pt pt_BR sl hu zh_CN ro gl ru bg de sv" +ALL_LINGUAS="bg cs de es fr gl hu it nl pl pt pt_BR ro ru sl sv zh_CN" AM_GLIB_GNU_GETTEXT # diff --git a/po/cs.po b/po/cs.po new file mode 100644 index 0000000..4cb2ea7 --- /dev/null +++ b/po/cs.po @@ -0,0 +1,81 @@ +# Czech (cs) translation of pidgin-libnotify +# Copyright (C) 2011 Jakub Adam +# This file is distributed under the same license as the pidgin-libnotify package. +# Jakub Adam , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: pidgin-libnotify\n" +"POT-Creation-Date: 2011-08-21 12:58+0200\n" +"PO-Revision-Date: 2011-08-21 00:00::00+GMT\n" +"Last-Translator: Jakub Adam \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/pidgin-libnotify.c:62 +msgid "New IM messages" +msgstr "Nové zprávy" + +#: ../src/pidgin-libnotify.c:67 +msgid "New chat messages" +msgstr "Nové příspÄ›vky v chatu" + +#: ../src/pidgin-libnotify.c:72 +msgid "Notify chat only when someone says my username" +msgstr "Upozornit na chat jen pokud nÄ›kdo napíše mé uživatelské jméno" + +#: ../src/pidgin-libnotify.c:77 +msgid "Only new conversations" +msgstr "Pouze nové konverzace" + +#: ../src/pidgin-libnotify.c:82 +msgid "Ignore events from blocked users" +msgstr "Ignorovat události od blokovaných uživatelů" + +#: ../src/pidgin-libnotify.c:87 +msgid "Buddy signs on" +msgstr "Kamarád se pÅ™ihlásil" + +#: ../src/pidgin-libnotify.c:92 +msgid "Buddy signs off" +msgstr "Kamarád se odhlásil" + +#: ../src/pidgin-libnotify.c:97 +msgid "Only when available" +msgstr "Jen, když jsem k dispozici" + +#: ../src/pidgin-libnotify.c:342 +msgid "Show" +msgstr "Ukaž" + +#: ../src/pidgin-libnotify.c:375 +#, c-format +msgid "%s signed on" +msgstr "%s se pÅ™ihlásil" + +#: ../src/pidgin-libnotify.c:407 +#, c-format +msgid "%s signed off" +msgstr "%s se odhlásil" + +#: ../src/pidgin-libnotify.c:434 +#, c-format +msgid "%s says:" +msgstr "%s napsal:" + +#: ../src/pidgin-libnotify.c:610 +msgid "Libnotify Popups" +msgstr "Vyskakovací okna libnotify" + +#: ../src/pidgin-libnotify.c:611 +msgid "Displays popups via libnotify." +msgstr "Zobrazuje vyskakovací okna pomocí libnotify" + +#: ../src/pidgin-libnotify.c:612 +msgid "" +"Pidgin-libnotify:\n" +"Displays popups via libnotify." +msgstr "" +"Pidgin-libnotify:\n" +"Upozorňuje na příchozí zprávy a další události pomocí vyskakovacích oken." -- debian/patches/fix-notify-osd.diff0000644000000000000000000000215611626064444014341 0ustar From: Jakub Adam Date: Sun, 21 Aug 2011 20:01:57 +0200 Subject: fix-notify-osd.diff --- src/pidgin-libnotify.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/pidgin-libnotify.c b/src/pidgin-libnotify.c index 9e2194d..fc24d4b 100644 --- a/src/pidgin-libnotify.c +++ b/src/pidgin-libnotify.c @@ -264,6 +264,7 @@ notify (const gchar *title, PurpleBuddyIcon *buddy_icon; gchar *tr_body; PurpleContact *contact; + GList *caps; contact = purple_buddy_get_contact (buddy); @@ -318,7 +319,11 @@ notify (const gchar *title, notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); - notify_notification_add_action (notification, "show", _("Show"), action_cb, NULL, NULL); + caps = notify_get_server_caps (); + if (g_list_find_custom (caps, "actions", (GCompareFunc)g_strcmp0)) { + notify_notification_add_action (notification, "show", _("Show"), action_cb, NULL, NULL); + } + g_list_free_full (caps, g_free); if (!notify_notification_show (notification, NULL)) { purple_debug_error (PLUGIN_ID, "notify(), failed to send notification\n"); -- debian/patches/it_po.diff0000644000000000000000000000675511327112627012600 0ustar diff -urN pidgin-libnotify-0.14.orig/po/it.po pidgin-libnotify-0.14/po/it.po --- pidgin-libnotify-0.14.orig/po/it.po 2010-01-24 13:31:58.000000000 -0500 +++ pidgin-libnotify-0.14/po/it.po 2010-01-24 13:32:31.000000000 -0500 @@ -1,79 +1,76 @@ # Italian (it) translation of gaim-libnotify. -# Copyright (C) 2006, Marco Cabizza -# # This file is distributed under the same license as gaim-libnotify. +# Copyright (C) 2006, Marco Cabizza +# Copyright (C) 2009, The Free Software Foundation, Inc. +# Gruppo traduzione italiano di Ubuntu, +# Milo Casagrande # msgid "" msgstr "" "Project-Id-Version: gaim-libnotify\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-30 19:58+0000\n" -"PO-Revision-Date: 2007-05-25 12:30-0300\n" -"Last-Translator: Marco Cabizza \n" +"POT-Creation-Date: 2009-09-29 16:23+0000\n" +"PO-Revision-Date: 2009-11-04 15:15+0000\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Launchpad-Export-Date: 2009-11-11 17:20+0000\n" +"X-Generator: Launchpad (build Unknown)\n" -#: src/pidgin-libnotify.c:57 -#, fuzzy +#: ../src/pidgin-libnotify.c:95 msgid "New messages" msgstr "Nuovi messaggi" -#: src/pidgin-libnotify.c:62 +#: ../src/pidgin-libnotify.c:100 msgid "Only new conversations" -msgstr "Solo le nuove finestre" +msgstr "Solo nuove conversazioni" -#: src/pidgin-libnotify.c:67 +#: ../src/pidgin-libnotify.c:105 msgid "Ignore events from blocked users" -msgstr "Ignora gli utenti bloccati" +msgstr "Ignora eventi da utenti bloccati" -#: src/pidgin-libnotify.c:72 -#, fuzzy +#: ../src/pidgin-libnotify.c:110 msgid "Buddy signs on" -msgstr "%s entra" +msgstr "Il conoscente si connette" -#: src/pidgin-libnotify.c:77 -#, fuzzy +#: ../src/pidgin-libnotify.c:115 msgid "Buddy signs off" -msgstr "%s entra" +msgstr "Il conoscente si disconnette" + +#: ../src/pidgin-libnotify.c:120 +msgid "Only when available" +msgstr "Solo quando disponibile" -#: src/pidgin-libnotify.c:315 +#: ../src/pidgin-libnotify.c:125 +msgid "Names to remove notifications for" +msgstr "Nomi per cui rimuovere le notifiche" + +#: ../src/pidgin-libnotify.c:505 msgid "Show" msgstr "Mostra" -#: src/pidgin-libnotify.c:347 -#, c-format -msgid "%s signed on" -msgstr "%s è entrato" - -#: src/pidgin-libnotify.c:379 -#, fuzzy, c-format -msgid "%s signed off" -msgstr "%s è entrato" - -#: src/pidgin-libnotify.c:406 -#, c-format -msgid "%s says:" -msgstr "%s dice:" +#: ../src/pidgin-libnotify.c:538 +msgid "is online" +msgstr "è in linea" + +#: ../src/pidgin-libnotify.c:567 +msgid "is offline" +msgstr "non è in linea" -#: src/pidgin-libnotify.c:572 +#: ../src/pidgin-libnotify.c:1399 msgid "Libnotify Popups" -msgstr "Popups di libnotify" +msgstr "Notifiche di libnotify" -#: src/pidgin-libnotify.c:573 +#: ../src/pidgin-libnotify.c:1400 msgid "Displays popups via libnotify." -msgstr "Mostra avvisi mediante libnotify." +msgstr "Visualizza le notifiche mediante libnotify." -#: src/pidgin-libnotify.c:574 -#, fuzzy +#: ../src/pidgin-libnotify.c:1401 msgid "" "Pidgin-libnotify:\n" "Displays popups via libnotify." msgstr "" -"Gaim-libnotify:\n" -"Mostra avvisi mediante libnotify." - -#~ msgid "Libnotify Interface" -#~ msgstr "Interfaccia libnotify" +"Pidgin-libnotify:\n" +"Visualizza le notifiche mediante libnotify." debian/patches/fix-printf-warnings.diff0000644000000000000000000000340711626064444015376 0ustar From: Jakub Adam Date: Sat, 20 Aug 2011 21:49:14 +0200 Subject: fix-printf-warnings.diff Fix compiler warnings - replace 0x%x -> %p in printf format strings Signed-off-by: Jakub Adam --- src/pidgin-libnotify.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pidgin-libnotify.c b/src/pidgin-libnotify.c index 5290584..ab166d1 100644 --- a/src/pidgin-libnotify.c +++ b/src/pidgin-libnotify.c @@ -181,7 +181,7 @@ action_cb (NotifyNotification *notification, PurpleConversation *conv = NULL; purple_debug_info (PLUGIN_ID, "action_cb(), " - "notification: 0x%x, action: '%s'", notification, action); + "notification: %p, action: '%s'", notification, action); buddy = (PurpleBuddy *)g_object_get_data (G_OBJECT(notification), "buddy"); @@ -207,7 +207,7 @@ closed_cb (NotifyNotification *notification) { PurpleContact *contact; - purple_debug_info (PLUGIN_ID, "closed_cb(), notification: 0x%x\n", notification); + purple_debug_info (PLUGIN_ID, "closed_cb(), notification: %p\n", notification); contact = (PurpleContact *)g_object_get_data (G_OBJECT(notification), "contact"); if (contact) @@ -449,13 +449,13 @@ notify_new_message_cb (PurpleAccount *account, #ifndef DEBUG /* in debug mode, always show notifications */ if (conv && purple_conversation_has_focus (conv)) { - purple_debug_info (PLUGIN_ID, "Conversation has focus 0x%x\n", conv); + purple_debug_info (PLUGIN_ID, "Conversation has focus %p\n", conv); return; } #endif if (conv && purple_prefs_get_bool ("/plugins/gtk/libnotify/newconvonly")) { - purple_debug_info (PLUGIN_ID, "Conversation is not new 0x%x\n", conv); + purple_debug_info (PLUGIN_ID, "Conversation is not new %p\n", conv); return; } -- debian/patches/series0000644000000000000000000000040011707627750012040 0ustar show_button_fix.diff de_po.diff fix-notify-osd.diff it_po.diff fix-libnotify0.7-compatibility.diff chat-nick-test-optional.diff fix-printf-warnings.diff add-cs-translation.diff replace-pidgin-action-requests.diff transient-hint-on-event-notifications.diff debian/patches/replace-pidgin-action-requests.diff0000644000000000000000000003532611707627750017503 0ustar From 9c39dfc1c415d017057f8a87d503b9a3f9f26603 Mon Sep 17 00:00:00 2001 From: Jakub Adam Date: Tue, 6 Sep 2011 22:58:23 +0200 Subject: [PATCH] replace-pidgin-action-requests.diff --- po/cs.po | 20 +++-- src/Makefile.am | 3 + src/common.c | 67 ++++++++++++++++++ src/common.h | 38 ++++++++++ src/pidgin-libnotify.c | 37 +++++----- src/request.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 320 insertions(+), 27 deletions(-) create mode 100644 src/common.c create mode 100644 src/common.h create mode 100644 src/request.c diff --git a/po/cs.po b/po/cs.po index 4cb2ea7..c213260 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: pidgin-libnotify\n" -"POT-Creation-Date: 2011-08-21 12:58+0200\n" +"POT-Creation-Date: 2011-09-06 22:17+0200\n" "PO-Revision-Date: 2011-08-21 00:00::00+GMT\n" "Last-Translator: Jakub Adam \n" "MIME-Version: 1.0\n" @@ -45,34 +45,38 @@ msgstr "Kamarád se odhlásil" msgid "Only when available" msgstr "Jen, když jsem k dispozici" -#: ../src/pidgin-libnotify.c:342 +#: ../src/pidgin-libnotify.c:102 +msgid "Replace Pidgin request dialogs with libnotify popups" +msgstr "Nahradit dotazovací dialogy Pidginu" + +#: ../src/pidgin-libnotify.c:338 msgid "Show" msgstr "Ukaž" -#: ../src/pidgin-libnotify.c:375 +#: ../src/pidgin-libnotify.c:368 #, c-format msgid "%s signed on" msgstr "%s se pÅ™ihlásil" -#: ../src/pidgin-libnotify.c:407 +#: ../src/pidgin-libnotify.c:400 #, c-format msgid "%s signed off" msgstr "%s se odhlásil" -#: ../src/pidgin-libnotify.c:434 +#: ../src/pidgin-libnotify.c:427 #, c-format msgid "%s says:" msgstr "%s napsal:" -#: ../src/pidgin-libnotify.c:610 +#: ../src/pidgin-libnotify.c:606 msgid "Libnotify Popups" msgstr "Vyskakovací okna libnotify" -#: ../src/pidgin-libnotify.c:611 +#: ../src/pidgin-libnotify.c:607 msgid "Displays popups via libnotify." msgstr "Zobrazuje vyskakovací okna pomocí libnotify" -#: ../src/pidgin-libnotify.c:612 +#: ../src/pidgin-libnotify.c:608 msgid "" "Pidgin-libnotify:\n" "Displays popups via libnotify." diff --git a/src/Makefile.am b/src/Makefile.am index ea0d757..ca00c87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,6 +8,9 @@ gd_LTLIBRARIES = pidgin-libnotify.la pidgin_libnotify_la_SOURCES = \ pidgin-libnotify.c \ + common.h \ + common.c \ + request.c \ gln_intl.h pidgin_libnotify_la_LIBADD = $(LIBNOTIFY_LIBS) $(DBUS_LIBS) $(GTK_LIBS) diff --git a/src/common.c b/src/common.c new file mode 100644 index 0000000..1b22dc0 --- /dev/null +++ b/src/common.c @@ -0,0 +1,67 @@ +/* + * Pidgin-libnotify - Provides a libnotify interface for Pidgin + * Copyright (C) 2005-2007 Duarte Henriques + * Copyright (C) 2011 Jakub Adam + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "common.h" + +#include +#include + +gboolean +server_has_caps(const char *id) +{ + GList *caps = notify_get_server_caps(); + gboolean result; + result = (g_list_find_custom(caps, id, (GCompareFunc)g_strcmp0) != NULL); + g_list_free_full(caps, g_free); + return result; +} + +typedef struct { + int id; + PurpleRequestActionCb callback; +} ActionData; + +NotifyNotification * +notification_new(const gchar *title, const gchar *body) +{ + NotifyNotification *notification; + +/* libnotify 0.7.0 and later has no support for attaching to widgets */ +#if NOTIFY_CHECK_VERSION(0,7,0) + notification = notify_notification_new(title, body, NULL); +#else + notification = notify_notification_new(title, body, NULL, NULL); +#endif + purple_debug_info(PLUGIN_ID, "notification_new(), title: '%s', body: '%s'", + title, body); + + notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL); + + return notification; +} + +void +notification_show(NotifyNotification *notification) +{ + if (!notify_notification_show (notification, NULL)) { + purple_debug_error (PLUGIN_ID, "notification_show(), " + "failed to send notification\n"); + } +} diff --git a/src/common.h b/src/common.h new file mode 100644 index 0000000..e6cdd92 --- /dev/null +++ b/src/common.h @@ -0,0 +1,38 @@ +/* + * Pidgin-libnotify - Provides a libnotify interface for Pidgin + * Copyright (C) 2005-2007 Duarte Henriques + * Copyright (C) 2011 Jakub Adam + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef PIDGIN_LIBNOTIFY_COMMON_H +#define PIDGIN_LIBNOTIFY_COMMON_H + +#include + +#define PLUGIN_ID "pidgin-libnotify" + +#ifndef NOTIFY_CHECK_VERSION +#define NOTIFY_CHECK_VERSION(x,y,z) 0 +#endif + +gboolean server_has_caps(const char *id); + +NotifyNotification * notification_new(const gchar *title, const gchar *body); + +void notification_show(NotifyNotification *notification); + +#endif // PIDGIN_LIBNOTIFY_COMMON_H diff --git a/src/pidgin-libnotify.c b/src/pidgin-libnotify.c index 3317610..161f8f9 100644 --- a/src/pidgin-libnotify.c +++ b/src/pidgin-libnotify.c @@ -21,6 +21,7 @@ #include #endif +#include "common.h" #include "gln_intl.h" #ifndef PURPLE_PLUGINS @@ -96,6 +97,11 @@ get_plugin_pref_frame (PurplePlugin *plugin) _("Only when available")); purple_plugin_pref_frame_add (frame, ppref); + ppref = purple_plugin_pref_new_with_name_and_label ( + "/plugins/gtk/libnotify/replace_requests", + _("Replace Pidgin request dialogs with libnotify popups")); + purple_plugin_pref_frame_add (frame, ppref); + return frame; } @@ -278,7 +284,6 @@ notify (const gchar *title, PurpleBuddyIcon *buddy_icon; gchar *tr_body; PurpleContact *contact; - GList *caps; contact = purple_buddy_get_contact (buddy); @@ -301,15 +306,8 @@ notify (const gchar *title, g_free (tr_body); return; } -/* libnotify 0.7.0 and later has no support for attaching to widgets */ -#if NOTIFY_CHECK_VERSION(0,7,0) - notification = notify_notification_new (title, tr_body, NULL); -#else - notification = notify_notification_new (title, tr_body, NULL, NULL); -#endif - purple_debug_info (PLUGIN_ID, "notify(), new: " - "title: '%s', body: '%s', buddy: '%s'\n", - title, tr_body, best_name (buddy)); + + notification = notification_new (title, tr_body); g_free (tr_body); @@ -336,18 +334,11 @@ notify (const gchar *title, g_signal_connect (notification, "closed", G_CALLBACK(closed_cb), NULL); - notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); - - caps = notify_get_server_caps (); - if (g_list_find_custom (caps, "actions", (GCompareFunc)g_strcmp0)) { + if (server_has_caps ("actions")) { notify_notification_add_action (notification, "show", _("Show"), action_cb, NULL, NULL); } - g_list_free_full (caps, g_free); - - if (!notify_notification_show (notification, NULL)) { - purple_debug_error (PLUGIN_ID, "notify(), failed to send notification\n"); - } + notification_show (notification); } static void @@ -500,6 +491,9 @@ notify_new_chat_cb (PurpleAccount *account, notify_msg_sent (account, sender, message); } +extern void attach_request_ui_ops (); +extern void detach_request_ui_ops (); + static gboolean plugin_load (PurplePlugin *plugin) { @@ -532,6 +526,8 @@ plugin_load (PurplePlugin *plugin) purple_signal_connect (conn_handle, "signed-on", plugin, PURPLE_CALLBACK(event_connection_throttle), NULL); + attach_request_ui_ops (); + return TRUE; } @@ -559,6 +555,8 @@ plugin_unload (PurplePlugin *plugin) purple_signal_disconnect (conn_handle, "signed-on", plugin, PURPLE_CALLBACK(event_connection_throttle)); + detach_request_ui_ops (); + g_hash_table_destroy (buddy_hash); notify_uninit (); @@ -618,6 +616,7 @@ init_plugin (PurplePlugin *plugin) purple_prefs_add_bool ("/plugins/gtk/libnotify/signon", TRUE); purple_prefs_add_bool ("/plugins/gtk/libnotify/signoff", FALSE); purple_prefs_add_bool ("/plugins/gtk/libnotify/only_available", FALSE); + purple_prefs_add_bool ("/plugins/gtk/libnotify/replace_requests", FALSE); } PURPLE_INIT_PLUGIN(notify, init_plugin, info) diff --git a/src/request.c b/src/request.c new file mode 100644 index 0000000..0957c31 --- /dev/null +++ b/src/request.c @@ -0,0 +1,182 @@ +/* + * Pidgin-libnotify - Provides a libnotify interface for Pidgin + * Copyright (C) 2011 Jakub Adam + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include + +#include "common.h" + +typedef struct { + int id; + PurpleRequestActionCb callback; +} ActionData; + +static void +action_cb (NotifyNotification *notification, char *action, + ActionData *data) +{ + data->callback(g_object_get_data(G_OBJECT(notification), "user_data"), + data->id); +} + +GSList *req_notifications = NULL; + +static gboolean +closed_cb (NotifyNotification *notification) +{ + req_notifications = g_slist_remove(req_notifications, notification); + g_object_unref(G_OBJECT(notification)); + + return FALSE; +} + +static gchar * +remove_accelerators (const gchar *s) +{ + gchar **split = g_strsplit(s, "_", -1); + gchar *result = g_strjoinv("", split); + g_strfreev(split); + return result; +} + +static PurpleRequestUiOps ops; +static PurpleRequestUiOps *original_ops = NULL; + +static void * +notify_request_action_with_icon(const char *title, const char *primary, + const char *secondary, int default_action, + PurpleAccount *account, const char *who, + PurpleConversation *conv, + gconstpointer icon_data, gsize icon_size, + void *user_data, + size_t action_count, va_list actions) +{ + NotifyNotification *notification; + int i; + + if (!purple_prefs_get_bool("/plugins/gtk/libnotify/replace_requests") || + !server_has_caps("actions")) { + return original_ops->request_action_with_icon(title, primary, secondary, + default_action, account, + who, conv, icon_data, + icon_size, user_data, + action_count, actions); + } + + notification = notification_new(primary, secondary); + + if (icon_data) { + GdkPixbuf *pixbuf = pidgin_pixbuf_from_data(icon_data, icon_size); + if (pixbuf) { + notify_notification_set_icon_from_pixbuf(notification, pixbuf); + g_object_unref (pixbuf); + } else { + purple_debug_warning(PLUGIN_ID, "notify_request_action_with_icon(), " + "failed to parse request icon\n"); + } + } + + notify_notification_set_hint(notification, "resident", + g_variant_new_boolean(TRUE)); + notify_notification_set_timeout(notification, NOTIFY_EXPIRES_NEVER); + + g_signal_connect(notification, "closed", G_CALLBACK(closed_cb), NULL); + + for (i = 0; i != action_count; ++i) { + char *label = remove_accelerators(va_arg (actions, const char *)); + ActionData *data = g_new(ActionData, 1); + data->id = i; + data->callback = va_arg(actions, PurpleRequestActionCb); + + notify_notification_add_action(notification, + (default_action == i) ? "default" : label, + label, + (NotifyActionCallback) action_cb, + data, g_free); + g_free(label); + } + + g_object_set_data(G_OBJECT(notification), "user_data", user_data); + + req_notifications = g_slist_append(req_notifications, notification); + + notification_show(notification); + + return notification; +} + +static void * +notify_request_action(const char *title, const char *primary, + const char *secondary, int default_action, + PurpleAccount *account, const char *who, + PurpleConversation *conv, void *user_data, + size_t action_count, va_list actions) +{ + if (!purple_prefs_get_bool("/plugins/gtk/libnotify/replace_requests") || + !server_has_caps("actions")) { + return original_ops->request_action(title, primary, secondary, + default_action, account, who, conv, + user_data, action_count, actions); + } + + return notify_request_action_with_icon(title, primary, secondary, + default_action, account, who, conv, + NULL, 0, user_data, action_count, + actions); +} + +static void +notify_close_request(PurpleRequestType type, void *ui_handle) +{ + GSList *l = g_slist_find(req_notifications, ui_handle); + if (l) { + NotifyNotification *notification = l->data; + notify_notification_close(notification, NULL); + } else { + original_ops->close_request(type, ui_handle); + } +} + +void +attach_request_ui_ops() +{ + original_ops = purple_request_get_ui_ops(); + if (original_ops) { + memcpy(&ops, original_ops, sizeof (ops)); + ops.request_action = notify_request_action; + ops.request_action_with_icon = notify_request_action_with_icon; + ops.close_request = notify_close_request; + purple_request_set_ui_ops(&ops); + } +} + +void +detach_request_ui_ops() +{ + if (original_ops) { + purple_request_set_ui_ops(original_ops); + } +} -- 1.7.5.4 debian/patches/de_po.diff0000644000000000000000000000063711201357465012547 0ustar Author: Jürgen Göricke Description: Fix translation for sign off message. --- pidgin-libnotify-0.14/po/de.po 2008-12-14 12:20:36.000000000 -0500 +++ de.po 2009-05-09 14:53:15.000000000 -0400 @@ -48,7 +48,7 @@ #: src/pidgin-libnotify.c:379 #, c-format msgid "%s signed off" -msgstr "%s hat sich angemeldet" +msgstr "%s hat sich abgemeldet" #: src/pidgin-libnotify.c:406 #, c-format debian/patches/chat-nick-test-optional.diff0000644000000000000000000000701111626064444016116 0ustar From: Jakub Adam Date: Sat, 20 Aug 2011 22:16:09 +0200 Subject: chat-nick-test-optional.diff Made check for nick in chat message optional Signed-off-by: Jakub Adam --- src/pidgin-libnotify.c | 44 +++++++++++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/pidgin-libnotify.c b/src/pidgin-libnotify.c index ab166d1..3317610 100644 --- a/src/pidgin-libnotify.c +++ b/src/pidgin-libnotify.c @@ -58,7 +58,17 @@ get_plugin_pref_frame (PurplePlugin *plugin) ppref = purple_plugin_pref_new_with_name_and_label ( "/plugins/gtk/libnotify/newmsg", - _("New messages")); + _("New IM messages")); + purple_plugin_pref_frame_add (frame, ppref); + + ppref = purple_plugin_pref_new_with_name_and_label ( + "/plugins/gtk/libnotify/newchat", + _("New chat messages")); + purple_plugin_pref_frame_add (frame, ppref); + + ppref = purple_plugin_pref_new_with_name_and_label ( + "/plugins/gtk/libnotify/chat_check_nick", + _("Notify chat only when someone says my username")); purple_plugin_pref_frame_add (frame, ppref); ppref = purple_plugin_pref_new_with_name_and_label ( @@ -466,20 +476,26 @@ notify_new_message_cb (PurpleAccount *account, } static void -notify_chat_nick (PurpleAccount *account, - const gchar *sender, - const gchar *message, - PurpleConversation *conv, - gpointer data) +notify_new_chat_cb (PurpleAccount *account, + const gchar *sender, + const gchar *message, + PurpleConversation *conv, + gpointer data) { - gchar *nick; - nick = (gchar *)purple_conv_chat_get_nick (PURPLE_CONV_CHAT(conv)); - if (nick && !strcmp (sender, nick)) + if (!purple_prefs_get_bool ("/plugins/gtk/libnotify/newchat")) return; - if (!g_strstr_len (message, strlen(message), nick)) - return; + if (purple_prefs_get_bool ("/plugins/gtk/libnotify/chat_check_nick")) { + gchar *nick; + + nick = (gchar *)purple_conv_chat_get_nick (PURPLE_CONV_CHAT(conv)); + if (nick && !strcmp (sender, nick)) + return; + + if (!g_strstr_len (message, strlen(message), nick)) + return; + } notify_msg_sent (account, sender, message); } @@ -510,7 +526,7 @@ plugin_load (PurplePlugin *plugin) PURPLE_CALLBACK(notify_new_message_cb), NULL); purple_signal_connect (conv_handle, "received-chat-msg", plugin, - PURPLE_CALLBACK(notify_chat_nick), NULL); + PURPLE_CALLBACK(notify_new_chat_cb), NULL); /* used just to not display the flood of guifications we'd get */ purple_signal_connect (conn_handle, "signed-on", plugin, @@ -538,7 +554,7 @@ plugin_unload (PurplePlugin *plugin) PURPLE_CALLBACK(notify_new_message_cb)); purple_signal_disconnect (conv_handle, "received-chat-msg", plugin, - PURPLE_CALLBACK(notify_chat_nick)); + PURPLE_CALLBACK(notify_new_chat_cb)); purple_signal_disconnect (conn_handle, "signed-on", plugin, PURPLE_CALLBACK(event_connection_throttle)); @@ -595,6 +611,8 @@ init_plugin (PurplePlugin *plugin) purple_prefs_add_none ("/plugins/gtk/libnotify"); purple_prefs_add_bool ("/plugins/gtk/libnotify/newmsg", TRUE); + purple_prefs_add_bool ("/plugins/gtk/libnotify/newchat", TRUE); + purple_prefs_add_bool ("/plugins/gtk/libnotify/chat_check_nick", TRUE); purple_prefs_add_bool ("/plugins/gtk/libnotify/blocked", TRUE); purple_prefs_add_bool ("/plugins/gtk/libnotify/newconvonly", FALSE); purple_prefs_add_bool ("/plugins/gtk/libnotify/signon", TRUE); -- debian/control0000644000000000000000000000132211732734472010601 0ustar Source: pidgin-libnotify Section: net Priority: optional Maintainer: Varun Hiremath Build-Depends: debhelper (>= 7), cdbs, intltool, pkg-config, libnotify-dev, libglib2.0-dev, libgtk2.0-dev, libtool, pidgin-dev, dh-autoreconf Standards-Version: 3.9.2 Homepage: http://gaim-libnotify.sourceforge.net Vcs-Svn: https://bollin.googlecode.com/svn/pidgin-libnotify/trunk/ Vcs-Browser: http://bollin.googlecode.com/svn/pidgin-libnotify/trunk/ Package: pidgin-libnotify Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: display notification bubbles in pidgin pidgin-libnotify is a Pidgin plugin which displays notification bubbles in Pidgin using libnotify and notification-daemon. debian/compat0000644000000000000000000000000211327112627010366 0ustar 7