[packages/xfce4-mailwatch-plugin] - up to 1.2.0
baggins
baggins at pld-linux.org
Sat Aug 16 09:20:39 CEST 2014
commit 047114e71ebe8bc418eae482653aea01c69df00b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Aug 16 09:20:32 2014 +0200
- up to 1.2.0
dsofix.patch | 23 ---
format-security.patch | 30 ----
gnutls-2.12.patch | 13 --
xfce4-mailwatch-plugin-ui.patch | 345 ----------------------------------------
xfce4-mailwatch-plugin.spec | 27 +---
5 files changed, 8 insertions(+), 430 deletions(-)
---
diff --git a/xfce4-mailwatch-plugin.spec b/xfce4-mailwatch-plugin.spec
index b3f487d..cf918b0 100644
--- a/xfce4-mailwatch-plugin.spec
+++ b/xfce4-mailwatch-plugin.spec
@@ -1,17 +1,13 @@
Summary: Multi-protocol, multi-mailbox mail watcher plugin for Xfce4 panel
Summary(pl.UTF-8): Wtyczka powiadamiania o poczcie dla panelu Xfce4
Name: xfce4-mailwatch-plugin
-Version: 1.1.0
-Release: 11
+Version: 1.2.0
+Release: 1
License: GPL v2
Group: X11/Applications
-Source0: http://spuriousinterrupt.org/files/mailwatch/%{name}-%{version}.tar.bz2
-# Source0-md5: f84dce86be1d7f25f169f262aaacee4e
-Patch0: %{name}-ui.patch
-Patch1: dsofix.patch
-Patch2: mbox-refresh-interval.patch
-Patch3: gnutls-2.12.patch
-Patch4: format-security.patch
+Source0: http://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/1.2/%{name}-%{version}.tar.bz2
+# Source0-md5: 7263114ec0f2987a3aff15afeeb45577
+Patch0: mbox-refresh-interval.patch
URL: http://spuriousinterrupt.org/projects/xfce4-mailwatch-plugin/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -51,10 +47,6 @@ Obecnie obsługuje następujące protokoły:
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%{__intltoolize}
@@ -74,8 +66,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
-mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libmailwatch.la
%find_lang %{name}
@@ -91,8 +82,6 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-mailwatch-plugin
-%{_datadir}/xfce4/panel-plugins/mailwatch.desktop
+%attr(755,root,root) %{_libdir}/xfce4/panel/plugins/libmailwatch.so
+%{_datadir}/xfce4/panel/plugins/mailwatch.desktop
%{_iconsdir}/hicolor/*/apps/*
-%{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*.png
diff --git a/dsofix.patch b/dsofix.patch
deleted file mode 100644
index 6bcc34e..0000000
--- a/dsofix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0.orig/panel-plugin/Makefile.in 2008-09-15 06:06:41.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.in 2010-02-17 14:59:06.000000000 +0100
-@@ -183,7 +183,7 @@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lgcrypt
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBSM_CFLAGS = @LIBSM_CFLAGS@
---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am~ 2011-09-24 16:13:16.000000000 +0300
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2011-09-24 16:14:10.031258292 +0300
-@@ -64,7 +65,8 @@
- @GTHREAD_LIBS@ \
- @LIBXFCE4PANEL_LIBS@ \
- @LIBXFCE4UI_LIBS@ \
-- @GNUTLS_LIBS@
-+ @GNUTLS_LIBS@ \
-+ -lgcrypt
-
- if HAVE_CYGWIN
- xfce4_mailwatch_plugin_LDFLAGS += \
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index e2baca6..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c
---- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c 2014-01-02 14:50:13.736123554 +0100
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c 2014-01-02 14:57:07.112787229 +0100
-@@ -224,7 +224,7 @@
- else
- reason = gnutls_strerror(ret);
- if(error)
-- g_set_error(error, XFCE_MAILWATCH_ERROR, code, reason);
-+ g_set_error(error, XFCE_MAILWATCH_ERROR, code, "%s", reason);
- g_critical("XfceMailwatch: TLS handshake failed: %s", reason);
-
- return FALSE;
-@@ -763,7 +763,7 @@
- break;
- else if(ret < 0 && EINTR != errno) {
- g_set_error(error, XFCE_MAILWATCH_ERROR,
-- XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
-+ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
- return -1;
- } else if(!block)
- return 0;
-@@ -779,7 +779,7 @@
- } else if(TIMER_EXPIRED(RECV_TIMEOUT)) {
- if(error) {
- g_set_error(error, XFCE_MAILWATCH_ERROR,
-- XFCE_MAILWATCH_ERROR_FAILED, strerror(ETIMEDOUT));
-+ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(ETIMEDOUT));
- }
- return -1;
- }
diff --git a/gnutls-2.12.patch b/gnutls-2.12.patch
deleted file mode 100644
index 3c290b8..0000000
--- a/gnutls-2.12.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c~ 2008-08-30 10:57:36.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c 2011-09-26 11:31:49.253892216 +0200
-@@ -621,8 +621,10 @@
- net_conn->gt_creds);
- gnutls_transport_set_ptr(net_conn->gt_session,
- (gnutls_transport_ptr_t)net_conn->fd);
-+#if GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 12
- if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
- gnutls_transport_set_lowat(net_conn->gt_session, 0);
-+#endif
-
- if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
- #if 0
diff --git a/xfce4-mailwatch-plugin-ui.patch b/xfce4-mailwatch-plugin-ui.patch
deleted file mode 100644
index cb22f2f..0000000
--- a/xfce4-mailwatch-plugin-ui.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/config.h.in xfce4-mailwatch-plugin-1.1.0/config.h.in
---- xfce4-mailwatch-plugin-1.1.0-orig/config.h.in 2008-09-15 06:07:59.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/config.h.in 2011-03-01 13:05:27.000000000 +0100
-@@ -139,12 +139,37 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
-
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
-
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-
-+/* Enable extensions on AIX 3, Interix. */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them. */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris. */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop. */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris. */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+
-+
- /* Version number of package */
- #undef VERSION
-
-@@ -154,13 +179,6 @@
- /* Define to 1 if the X Window System is missing or not being used. */
- #undef X_DISPLAY_MISSING
-
--/* Define to 1 if on AIX 3.
-- System headers sometimes define this.
-- We just want to avoid a redefinition error message. */
--#ifndef _ALL_SOURCE
--# undef _ALL_SOURCE
--#endif
--
- /* Define to 1 if on MINIX. */
- #undef _MINIX
-
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/configure.ac xfce4-mailwatch-plugin-1.1.0/configure.ac
---- xfce4-mailwatch-plugin-1.1.0-orig/configure.ac 2008-09-15 06:05:51.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/configure.ac 2011-03-01 13:05:23.307979738 +0100
-@@ -57,7 +57,7 @@
- XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
- XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
- XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
--XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
-+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-
- XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20],
- [have_44_panel=yes], [
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch.c 2008-09-11 06:43:38.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch.c 2011-03-01 13:05:23.308980238 +0100
-@@ -41,7 +41,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch.h"
- #include "mailwatch-utils.h"
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-gmail.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-gmail.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-gmail.c 2008-08-30 10:37:11.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-gmail.c 2011-03-01 13:05:23.313982738 +0100
-@@ -74,7 +74,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch-utils.h"
- #include "mailwatch.h"
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-imap.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-imap.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-imap.c 2008-08-30 10:56:12.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-imap.c 2011-03-01 13:05:23.314983238 +0100
-@@ -58,7 +58,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch-net-conn.h"
- #include "mailwatch-utils.h"
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-maildir.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-maildir.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-maildir.c 2008-09-11 06:27:32.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-maildir.c 2011-03-01 13:05:23.316984238 +0100
-@@ -48,7 +48,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch.h"
-
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-mbox.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mbox.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-mbox.c 2008-09-11 06:31:50.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mbox.c 2011-03-01 13:05:23.317984738 +0100
-@@ -48,7 +48,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch.h"
-
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-mh.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mh.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-mh.c 2008-08-26 02:37:05.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-mh.c 2011-03-01 13:05:23.318985238 +0100
-@@ -48,7 +48,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch.h"
-
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-pop3.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-pop3.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-mailbox-pop3.c 2008-08-30 10:58:35.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-mailbox-pop3.c 2011-03-01 13:05:23.319985738 +0100
-@@ -42,7 +42,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch-utils.h"
- #include "mailwatch.h"
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-utils.c xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-utils.c
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/mailwatch-utils.c 2008-08-26 04:42:36.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-utils.c 2011-03-01 14:26:08.122510014 +0100
-@@ -52,7 +52,7 @@
-
- #include <gtk/gtk.h>
-
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
-
- #include "mailwatch-utils.h"
- #include "mailwatch-common.h"
-@@ -78,7 +78,7 @@
- img = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
- if(!img || gtk_image_get_storage_type(GTK_IMAGE(img)) == GTK_IMAGE_EMPTY) {
- gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &iw, &ih);
-- pix = xfce_themed_icon_load(icon, iw);
-+ pix = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), icon, iw, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
- if(pix) {
- if(img)
- gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
-@@ -106,13 +106,7 @@
- GtkWidget *
- xfce_mailwatch_create_framebox(const gchar *title, GtkWidget **frame_bin)
- {
--#if LIBXFCEGUI4_CHECK_VERSION(4, 3, 4)
-- return xfce_create_framebox(title, frame_bin);
--#else
-- GtkWidget *frame = xfce_framebox_new(title, TRUE);
-- *frame_bin = XFCE_FRAMEBOX(frame)->hbox;
-- return frame;
--#endif
-+ return xfce_gtk_frame_box_new(title, frame_bin);
- }
-
- #ifdef HAVE_SSL_SUPPORT
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/Makefile.am xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/Makefile.am
---- xfce4-mailwatch-plugin-1.1.0-orig/libmailwatch-core/Makefile.am 2008-08-26 04:42:36.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/Makefile.am 2011-03-01 13:05:23.320986238 +0100
-@@ -27,7 +27,7 @@
- libmailwatch_core_la_CFLAGS = \
- @GTHREAD_CFLAGS@ \
- @GTK_CFLAGS@ \
-- @LIBXFCEGUI4_CFLAGS@ \
-+ @LIBXFCE4UI_CFLAGS@ \
- @GNUTLS_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" \
- -DLOCALEDIR=\"$(localedir)\"
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/mailwatch-plugin-4.2.c xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin-4.2.c
---- xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/mailwatch-plugin-4.2.c 2008-08-16 09:35:33.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin-4.2.c 2011-03-01 13:05:23.323987738 +0100
-@@ -23,7 +23,7 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
-+#include <libxfce4ui/libxfce4ui.h>
- #include <libxfcegui4/xfce_scaled_image.h>
-
- #include <panel/plugins.h>
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/mailwatch-plugin.c xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin.c
---- xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/mailwatch-plugin.c 2008-09-15 06:04:47.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/mailwatch-plugin.c 2011-03-01 14:21:43.710510011 +0100
-@@ -30,9 +30,8 @@
- #include <gtk/gtk.h>
-
- #include <libxfce4util/libxfce4util.h>
--#include <libxfcegui4/libxfcegui4.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
--#include <libxfce4panel/xfce-panel-convenience.h>
-+#include <libxfce4ui/libxfce4ui.h>
-+#include <libxfce4panel/libxfce4panel.h>
-
- #include "mailwatch.h"
- #include "mailwatch-mailbox.h"
-@@ -145,7 +144,7 @@
- g_string_free(ttip_str, TRUE);
-
- if(mwp->new_messages_command)
-- xfce_exec(mwp->new_messages_command, FALSE, FALSE, NULL);
-+ xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->new_messages_command, FALSE, FALSE, NULL);
- }
- }
- }
-@@ -175,7 +174,7 @@
- switch(evt->button) {
- case 1: /* left */
- if(mwp->click_command && *mwp->click_command)
-- xfce_exec(mwp->click_command, FALSE, FALSE, NULL);
-+ xfce_spawn_command_line_on_screen(gdk_screen_get_default(), mwp->click_command, FALSE, FALSE, NULL);
- break;
-
- case 2: /* middle */
-@@ -809,7 +808,7 @@
- {
- GError *err = NULL;
-
-- if(!xfce_exec("xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
-+ if(!xfce_spawn_command_line_on_screen(gdk_screen_get_default(), "xfhelp4 xfce4-mailwatch-plugin.html", FALSE, FALSE, &err)) {
- gchar *secondary = g_strdup_printf(_("Help is unavailable because 'xfhelp4' could not be run: %s"),
- err->message);
- xfce_message_dialog(NULL, _("Help Unavailable"), GTK_STOCK_DIALOG_ERROR,
-@@ -1025,35 +1024,28 @@
- gpointer user_data)
- {
- XfceMailwatchPlugin *mwp = user_data;
-- XfceAboutInfo *ainfo;
- GdkPixbuf *icon;
--
-- if(G_UNLIKELY(mwp->about_dialog)) {
-- gtk_window_present(GTK_WINDOW(mwp->about_dialog));
-- return;
-- }
--
-- ainfo = xfce_about_info_new(_("Xfce4 Mailwatch Plugin"),
-- VERSION,
-- _("A featureful mail-checker applet for the Xfce Panel"),
-- _("Copyright (c) 2005-2008 Brian Tarricone\n"
-- "Copyright (c) 2005 Pasi Orovuo"),
-- XFCE_LICENSE_GPL);
-- xfce_about_info_set_homepage(ainfo, WEBSITE);
-- xfce_about_info_add_credit(ainfo, "Brian J. Tarricone",
-- "bjt23 at cornell.edu",
-- _("Maintainer, Original Author"));
-- xfce_about_info_add_credit(ainfo, "Pasi Orovuo", "pasi.ov at gmail.com",
-- _("Developer"));
--
-- icon = xfce_themed_icon_load("xfce-mail", 32);
--
-- mwp->about_dialog = xfce_about_dialog_new_with_values(NULL, ainfo, icon);
-- g_object_add_weak_pointer(G_OBJECT(mwp->about_dialog),
-- (gpointer)&mwp->about_dialog);
-- gtk_widget_show_all(mwp->about_dialog);
-- g_signal_connect(G_OBJECT(mwp->about_dialog), "response",
-- G_CALLBACK(gtk_widget_destroy), NULL);
-+ const gchar *auth[] = { "Brian J. Tarricone bjt23 at cornell.edu Maintainer, Original Author",
-+ "Pasi Orovuo pasi.ov at gmail.com Developer",
-+ NULL };
-+
-+ icon = xfce_panel_pixbuf_from_source("xfce-mail", NULL, 32);
-+
-+#if !GTK_CHECK_VERSION (2, 18, 0)
-+ gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-+ gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
-+#endif
-+ gtk_show_about_dialog(NULL,
-+ "logo", icon,
-+ "program-name", _("Xfce4 Mailwatch Plugin"),
-+ "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
-+ "version", VERSION,
-+ "comments", _("A featureful mail-checker applet for the Xfce Panel"),
-+ "website", WEBSITE,
-+ "copyright", _("Copyright (c) 2005-2008 Brian Tarricone\n"
-+ "Copyright (c) 2005 Pasi Orovuo"),
-+ "authors", auth,
-+ NULL);
-
- if(icon)
- g_object_unref(G_OBJECT(icon));
-diff -ur xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/Makefile.am xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am
---- xfce4-mailwatch-plugin-1.1.0-orig/panel-plugin/Makefile.am 2008-08-26 04:42:36.000000000 +0200
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2011-03-01 13:05:23.325988738 +0100
-@@ -26,6 +26,7 @@
- -I$(top_srcdir)/libmailwatch-core \
- @GTHREAD_CFLAGS@ \
- @XFCE4_PANEL_CFLAGS@ \
-+ @LIBXFCE4UI_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" \
- -DLOCALEDIR=\"$(localedir)\"
-
-@@ -36,6 +37,7 @@
- $(top_builddir)/libmailwatch-core/libmailwatch-core.la \
- @GTHREAD_LIBS@ \
- @XFCE4_PANEL_LIBS@ \
-+ @LIBXFCE4UI_LIBS@ \
- @GNUTLS_LIBS@
-
- else
-@@ -50,6 +52,7 @@
- -I$(top_srcdir)/libmailwatch-core \
- @GTHREAD_CFLAGS@ \
- @LIBXFCE4PANEL_CFLAGS@ \
-+ @LIBXFCE4UI_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" \
- -DLOCALEDIR=\"$(localedir)\"
-
-@@ -60,6 +63,7 @@
- $(top_builddir)/libmailwatch-core/libmailwatch-core.la \
- @GTHREAD_LIBS@ \
- @LIBXFCE4PANEL_LIBS@ \
-+ @LIBXFCE4UI_LIBS@ \
- @GNUTLS_LIBS@
-
- if HAVE_CYGWIN
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfce4-mailwatch-plugin.git/commitdiff/047114e71ebe8bc418eae482653aea01c69df00b
More information about the pld-cvs-commit
mailing list