[Xfce4-commits] <xfce4-mailwatch-plugin:master> Port to libxfce4ui
Ján SuÄan
noreply at xfce.org
Fri Aug 30 10:18:01 CEST 2013
Updating branch refs/heads/master
to 5c2ae425668949686670f6b695ee20dadb588f49 (commit)
from 47da4a9a330c646a6b62eed28f11726785902ae0 (commit)
commit 5c2ae425668949686670f6b695ee20dadb588f49
Author: Ján Sučan <sucan at runbox.com>
Date: Fri Aug 30 09:49:32 2013 +0200
Port to libxfce4ui
Thanks to the author of PLD Linux port of xfce4-mailwatch-plugin to
libxfce4ui.
configure.ac.in | 12 ++---
libmailwatch-core/Makefile.am | 2 +-
libmailwatch-core/mailwatch-mailbox-gmail.c | 2 +-
libmailwatch-core/mailwatch-mailbox-imap.c | 2 +-
libmailwatch-core/mailwatch-mailbox-maildir.c | 2 +-
libmailwatch-core/mailwatch-mailbox-mbox.c | 2 +-
libmailwatch-core/mailwatch-mailbox-mh.c | 2 +-
libmailwatch-core/mailwatch-mailbox-pop3.c | 2 +-
libmailwatch-core/mailwatch-utils.c | 13 ++----
libmailwatch-core/mailwatch.c | 2 +-
panel-plugin/Makefile.am | 4 +-
panel-plugin/mailwatch-plugin.c | 61 ++++++++++++-------------
12 files changed, 47 insertions(+), 59 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index dab6bc9..7c36b24 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -51,13 +51,11 @@ XDT_CHECK_LIBX11_REQUIRE
XDT_CHECK_LIBSM
dnl required
-XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.4.0])
-XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.4.0])
-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([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.18.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
dnl see if we have a new enough libxfce4util for the posix signal handler stuff
saved_CFLAGS="$CFLAGS"
diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am
index 59cfb19..00ea3e7 100644
--- a/libmailwatch-core/Makefile.am
+++ b/libmailwatch-core/Makefile.am
@@ -27,7 +27,7 @@ endif
libmailwatch_core_la_CFLAGS = \
@GTHREAD_CFLAGS@ \
@GTK_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@ \
@GNUTLS_CFLAGS@ \
@LIBGCRYPT_CFLAGS@ \
-DDATADIR=\"$(datadir)\" \
diff --git a/libmailwatch-core/mailwatch-mailbox-gmail.c b/libmailwatch-core/mailwatch-mailbox-gmail.c
index 6af467c..7f39c4d 100644
--- a/libmailwatch-core/mailwatch-mailbox-gmail.c
+++ b/libmailwatch-core/mailwatch-mailbox-gmail.c
@@ -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 --git a/libmailwatch-core/mailwatch-mailbox-imap.c b/libmailwatch-core/mailwatch-mailbox-imap.c
index 3a0576e..8ffce3d 100644
--- a/libmailwatch-core/mailwatch-mailbox-imap.c
+++ b/libmailwatch-core/mailwatch-mailbox-imap.c
@@ -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 --git a/libmailwatch-core/mailwatch-mailbox-maildir.c b/libmailwatch-core/mailwatch-mailbox-maildir.c
index b7a0022..13a350f 100644
--- a/libmailwatch-core/mailwatch-mailbox-maildir.c
+++ b/libmailwatch-core/mailwatch-mailbox-maildir.c
@@ -48,7 +48,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "mailwatch.h"
diff --git a/libmailwatch-core/mailwatch-mailbox-mbox.c b/libmailwatch-core/mailwatch-mailbox-mbox.c
index c242079..ac8b935 100644
--- a/libmailwatch-core/mailwatch-mailbox-mbox.c
+++ b/libmailwatch-core/mailwatch-mailbox-mbox.c
@@ -48,7 +48,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "mailwatch.h"
diff --git a/libmailwatch-core/mailwatch-mailbox-mh.c b/libmailwatch-core/mailwatch-mailbox-mh.c
index dd457fa..a12f717 100644
--- a/libmailwatch-core/mailwatch-mailbox-mh.c
+++ b/libmailwatch-core/mailwatch-mailbox-mh.c
@@ -48,7 +48,7 @@
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include "mailwatch.h"
diff --git a/libmailwatch-core/mailwatch-mailbox-pop3.c b/libmailwatch-core/mailwatch-mailbox-pop3.c
index 25ed6e7..94c3122 100644
--- a/libmailwatch-core/mailwatch-mailbox-pop3.c
+++ b/libmailwatch-core/mailwatch-mailbox-pop3.c
@@ -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 --git a/libmailwatch-core/mailwatch-utils.c b/libmailwatch-core/mailwatch-utils.c
index 93a6fbf..912bd13 100644
--- a/libmailwatch-core/mailwatch-utils.c
+++ b/libmailwatch-core/mailwatch-utils.c
@@ -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,8 @@ xfce_mailwatch_custom_button_new(const gchar *text, const gchar *icon)
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 +107,7 @@ xfce_mailwatch_custom_button_new(const gchar *text, const gchar *icon)
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 --git a/libmailwatch-core/mailwatch.c b/libmailwatch-core/mailwatch.c
index 90081d6..76a35f9 100644
--- a/libmailwatch-core/mailwatch.c
+++ b/libmailwatch-core/mailwatch.c
@@ -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 --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 0d89440..df2c2d8 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -8,7 +8,7 @@ xfce4_mailwatch_plugin_CFLAGS = \
-I$(top_srcdir)/libmailwatch-core \
@GTHREAD_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@ \
- @LIBXFCEGUI4_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@ \
-DDATADIR=\"$(datadir)\" \
-DLOCALEDIR=\"$(localedir)\"
@@ -19,7 +19,7 @@ xfce4_mailwatch_plugin_LDADD = \
$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
@GTHREAD_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
+ @LIBXFCE4UI_LIBS@ \
@GNUTLS_LIBS@ \
@LIBGCRYPT_LIBS@
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 350b98e..e69a937 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -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"
@@ -157,7 +156,9 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, gpointer arg,
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);
}
}
}
@@ -187,7 +188,9 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton *evt,
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 */
@@ -825,7 +828,9 @@ mailwatch_help_clicked_cb(GtkWidget *w,
{
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,
@@ -1043,35 +1048,25 @@ mailwatch_show_about(XfcePanelPlugin *plugin,
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);
+
+ 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));
More information about the Xfce4-commits
mailing list