[Xfce4-commits] xfce4-mailwatch-plugin:master Fix running command on each change of the count

[Ján Sučan]

Updating branch refs/heads/master
 to dfe2286f1ee91ba812c785796c9c31f6ca702525 (commit)
   from db36f97aaca40ec8d52015232e95e3a2f10d295b (commit)

commit dfe2286f1ee91ba812c785796c9c31f6ca702525
Author: Ján Sučan su...@runbox.com
Date:   Sat Dec 21 11:05:09 2013 +0100

Fix running command on each change of the count

Run command even on change from non-zero to zero new message count.

 panel-plugin/mailwatch-plugin.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 79d196a..6aa0463 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -145,6 +145,11 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
mwp);
 gtk_widget_set_tooltip_text(mwp-button, _(No new mail));
 gtk_widget_trigger_tooltip_query(mwp-button);
+/* Run command on any change of count of new messages. */
+if (mwp-count_changed_command)
+xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
+  mwp-count_changed_command,
+  FALSE, FALSE, NULL);
 } else if (new_messages  0) {
 if (!mwp-newmail_icon_visible) {
 mwp-newmail_icon_visible = TRUE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to ac2677a29fd587fad06e982b2a2df24b706a19d4 (commit)
   from dfe2286f1ee91ba812c785796c9c31f6ca702525 (commit)

commit ac2677a29fd587fad06e982b2a2df24b706a19d4
Author: Ján Sučan su...@runbox.com
Date:   Sat Dec 21 11:20:50 2013 +0100

Refactor the code

 panel-plugin/mailwatch-plugin.c |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 6aa0463..53c3b37 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -80,26 +80,26 @@ typedef struct
 XfcePanelPlugin *plugin;
 XfceMailwatch   *mailwatch;
 
-GtkWidget *button;
-GtkWidget *image;
+GtkWidget   *button;
+GtkWidget   *image;
 
-gboolean newmail_icon_visible;
-guintnew_messages;
+gboolean newmail_icon_visible;
+guintnew_messages;
 
-gchar *click_command;
-gchar *new_messages_command;
-gchar *count_changed_command;
+gchar   *click_command;
+gchar   *new_messages_command;
+gchar   *count_changed_command;
 
-GdkPixbuf *pix_normal;
-GdkPixbuf *pix_newmail;
-gchar *normal_icon;
-gchar *new_mail_icon;
+GdkPixbuf   *pix_normal;
+GdkPixbuf   *pix_newmail;
+gchar   *normal_icon;
+gchar   *new_mail_icon;
 
 GtkWidget *log_dialog;
-guint log_lines;
-gboolean  show_log_status;
+guint  log_lines;
+gboolean   show_log_status;
 GdkPixbuf *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
-XfceMailwatchLogLevel log_status;
+XfceMailwatchLogLevel  log_status;
 GtkListStore  *loglist;
 
 gboolean auto_open_online_doc;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Add credit to the THANKS file

[Ján Sučan]

Updating branch refs/heads/master
 to ba7f4a44da05c6d72f1a2a07f4eea9ebf2b7ddb0 (commit)
   from a34a38b895c01836bb48b4b2fdecb7d55f9fb4ee (commit)

commit ba7f4a44da05c6d72f1a2a07f4eea9ebf2b7ddb0
Author: Ján Sučan su...@runbox.com
Date:   Sat Dec 21 00:49:22 2013 +0100

Add credit to the THANKS file

 THANKS |6 ++
 1 file changed, 6 insertions(+)

diff --git a/THANKS b/THANKS
index 2d7fc40..2a80750 100644
--- a/THANKS
+++ b/THANKS
@@ -1,3 +1,9 @@
+Testing and suggestions
+===
+
+Lachlan Turner  (bug 8612)
+
+
 Translations
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Do not run command when new message count is 0

[Ján Sučan]

Updating branch refs/heads/master
 to a34a38b895c01836bb48b4b2fdecb7d55f9fb4ee (commit)
   from 4888631fb62a4dcaa3e666348e5726acd830acce (commit)

commit a34a38b895c01836bb48b4b2fdecb7d55f9fb4ee
Author: Ján Sučan su...@runbox.com
Date:   Sat Dec 21 00:34:50 2013 +0100

Do not run command when new message count is 0

Introduce two commands to run on change of new message count. One
command is executed only when new message count changes from zero to
non-zero. The second is executed on each change of the count thus
preserving an old functionality.

 panel-plugin/mailwatch-plugin.c |   55 ---
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 6dca785..067aa59 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -88,6 +88,7 @@ typedef struct
 
 gchar *click_command;
 gchar *new_messages_command;
+gchar *count_changed_command;
 
 GdkPixbuf *pix_normal;
 GdkPixbuf *pix_newmail;
@@ -161,7 +162,6 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
ngettext(You have %d new message:,
 You have %d new messages:,
 new_messages), new_messages);
-mwp-new_messages = new_messages;
 
 xfce_mailwatch_get_new_message_breakdown(mwp-mailwatch,
 mailbox_names, new_message_counts);
@@ -181,11 +181,19 @@ mailwatch_new_messages_changed_cb(XfceMailwatch 
*mailwatch,
 gtk_widget_set_tooltip_text(mwp-button, ttip_str-str);
 gtk_widget_trigger_tooltip_query(mwp-button);
 g_string_free(ttip_str, TRUE);
-
-if (mwp-new_messages_command)
+/* Run command when count of new messages changes from
+ * zero to non-zero. */
+if (mwp-new_messages == 0  mwp-new_messages_command)
 xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
   mwp-new_messages_command,
   FALSE, FALSE, NULL);
+/* Run command on any change of count of new messages. */
+if (mwp-count_changed_command)
+xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
+  mwp-count_changed_command,
+  FALSE, FALSE, NULL);
+/* Save the actual count of new messages.*/
+mwp-new_messages = new_messages;
 }
 }
 }
@@ -520,6 +528,10 @@ mailwatch_read_config(XfcePanelPlugin *plugin,
 value = xfce_rc_read_entry(rc, new_messages_command, NULL);
 if(value)
 mwp-new_messages_command = g_strdup(value);
+
+value = xfce_rc_read_entry(rc, count_changed_command, NULL);
+if(value)
+  mwp-count_changed_command = g_strdup(value);
 
 value = xfce_rc_read_entry(rc, normal_icon, NULL);
 if (value) {
@@ -582,6 +594,8 @@ mailwatch_write_config(XfcePanelPlugin *plugin,
 mwp-click_command?mwp-click_command:);
 xfce_rc_write_entry(rc, new_messages_command,
 
mwp-new_messages_command?mwp-new_messages_command:);
+xfce_rc_write_entry(rc, count_changed_command,
+
mwp-count_changed_command?mwp-count_changed_command:);
 xfce_rc_write_entry(rc, normal_icon,
 mwp-normal_icon?mwp-normal_icon:DEFAULT_NORMAL_ICON);
 xfce_rc_write_entry(rc, new_mail_icon,
@@ -783,6 +797,22 @@ mailwatch_newmsg_command_focusout_cb(GtkWidget *w,
 return FALSE;
 }
 
+static gboolean
+mailwatch_count_changed_command_focusout_cb(GtkWidget *w,
+GdkEventFocus *evt,
+gpointer   user_data)
+{
+XfceMailwatchPlugin *mwp = user_data;
+gchar *command;
+
+g_free(mwp-count_changed_command);
+
+command = gtk_editable_get_chars(GTK_EDITABLE(w), 0, -1);
+mwp-count_changed_command = g_strdup(command ? command : );
+
+return FALSE;
+}
+
 static void
 mailwatch_iconbtn_clicked_cb(GtkWidget   *w,
  XfceMailwatchPlugin *mwp)
@@ -1024,6 +1054,7 @@ mailwatch_create_options(XfcePanelPlugin *plugin,
 GtkWidget *table;
 GtkWidget *lbl_onclick;
 GtkWidget *lbl_onnewmessages;
+GtkWidget *lbl_count_changed_command;
 GtkWidget *halign;
 
 frame = xfce_gtk_frame_box_new(_(External Programs), frame_bin);
@@ -1038,11 +1069,18 @@ mailwatch_create_options(XfcePanelPlugin *plugin,
 gtk_table_attach(GTK_TABLE(table), halign, 0, 1, 0, 1,
  GTK_FILL, GTK_FILL, BORDER / 4, BORDER / 4);
 
-lbl_onnewmessages

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix running an empty command

[Ján Sučan]

Updating branch refs/heads/master
 to db36f97aaca40ec8d52015232e95e3a2f10d295b (commit)
   from ba7f4a44da05c6d72f1a2a07f4eea9ebf2b7ddb0 (commit)

commit db36f97aaca40ec8d52015232e95e3a2f10d295b
Author: Ján Sučan su...@runbox.com
Date:   Sat Dec 21 00:52:27 2013 +0100

Fix running an empty command

 panel-plugin/mailwatch-plugin.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 067aa59..79d196a 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -792,7 +792,7 @@ mailwatch_newmsg_command_focusout_cb(GtkWidget *w,
 g_free(mwp-new_messages_command);
 
 command = gtk_editable_get_chars(GTK_EDITABLE(w), 0, -1);
-mwp-new_messages_command = g_strdup(command ? command : );
+mwp-new_messages_command = g_strdup(command ? command : NULL);
 
 return FALSE;
 }
@@ -808,7 +808,7 @@ mailwatch_count_changed_command_focusout_cb(GtkWidget 
*w,
 g_free(mwp-count_changed_command);
 
 command = gtk_editable_get_chars(GTK_EDITABLE(w), 0, -1);
-mwp-count_changed_command = g_strdup(command ? command : );
+mwp-count_changed_command = g_strdup(command ? command : NULL);
 
 return FALSE;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Remove needless function call

[Ján Sučan]

Updating branch refs/heads/master
 to 4888631fb62a4dcaa3e666348e5726acd830acce (commit)
   from db591222fa05cb6504bec29a2ca0e55a352bcaa2 (commit)

commit 4888631fb62a4dcaa3e666348e5726acd830acce
Author: Ján Sučan su...@runbox.com
Date:   Thu Dec 19 16:56:52 2013 +0100

Remove needless function call

 libmailwatch-core/mailwatch-mailbox-imap.c |8 
 libmailwatch-core/mailwatch-mailbox-pop3.c |4 ++--
 libmailwatch-core/mailwatch-utils.c|6 --
 libmailwatch-core/mailwatch-utils.h|2 --
 libmailwatch-core/mailwatch.c  |2 +-
 panel-plugin/mailwatch-plugin.c|4 ++--
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/libmailwatch-core/mailwatch-mailbox-imap.c 
b/libmailwatch-core/mailwatch-mailbox-imap.c
index 47b2229..78cc7c1 100644
--- a/libmailwatch-core/mailwatch-mailbox-imap.c
+++ b/libmailwatch-core/mailwatch-mailbox-imap.c
@@ -1415,7 +1415,7 @@ imap_config_newmailfolders_btn_clicked_cb(GtkWidget *w, 
gpointer user_data)
  G_CALLBACK(imap_config_newmailfolders_destroy_cb),
  imailbox);
 
-frame = xfce_mailwatch_create_framebox(_(New Mail Folders), frame_bin);
+frame = xfce_gtk_frame_box_new(_(New Mail Folders), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, TRUE, TRUE, 0);
 
@@ -1592,7 +1592,7 @@ imap_config_advanced_btn_clicked_cb(GtkWidget *w, 
gpointer user_data)
 gtk_widget_show(topvbox);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-vbox), topvbox, TRUE, TRUE, 0);
 
-frame = xfce_mailwatch_create_framebox(_(Connection), frame_bin);
+frame = xfce_gtk_frame_box_new(_(Connection), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
@@ -1649,7 +1649,7 @@ imap_config_advanced_btn_clicked_cb(GtkWidget *w, 
gpointer user_data)
 g_object_set_data(G_OBJECT(chk), xfmw-entry, entry);
 g_object_set_data(G_OBJECT(combo), xfmw-entry, entry);
 
-frame = xfce_mailwatch_create_framebox(_(Folders), frame_bin);
+frame = xfce_gtk_frame_box_new(_(Folders), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
@@ -1687,7 +1687,7 @@ imap_get_setup_page(XfceMailwatchMailbox *mailbox)
 topvbox = gtk_vbox_new(FALSE, BORDER/2);
 gtk_widget_show(topvbox);
 
-frame = xfce_mailwatch_create_framebox(_(IMAP Server), frame_bin);
+frame = xfce_gtk_frame_box_new(_(IMAP Server), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
diff --git a/libmailwatch-core/mailwatch-mailbox-pop3.c 
b/libmailwatch-core/mailwatch-mailbox-pop3.c
index 352eced..291d0cc 100644
--- a/libmailwatch-core/mailwatch-mailbox-pop3.c
+++ b/libmailwatch-core/mailwatch-mailbox-pop3.c
@@ -755,7 +755,7 @@ pop3_config_advanced_btn_clicked_cb(GtkWidget *w, gpointer 
user_data)
 gtk_widget_show(topvbox);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-vbox), topvbox, TRUE, TRUE, 0);
 
-frame = xfce_mailwatch_create_framebox(_(Connection), frame_bin);
+frame = xfce_gtk_frame_box_new(_(Connection), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
@@ -827,7 +827,7 @@ pop3_get_setup_page(XfceMailwatchMailbox *mailbox)
 topvbox = gtk_vbox_new(FALSE, BORDER/2);
 gtk_widget_show(topvbox);
 
-frame = xfce_mailwatch_create_framebox(_(POP3 Server), frame_bin);
+frame = xfce_gtk_frame_box_new(_(POP3 Server), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
diff --git a/libmailwatch-core/mailwatch-utils.c 
b/libmailwatch-core/mailwatch-utils.c
index 1771b7d..3feeb22 100644
--- a/libmailwatch-core/mailwatch-utils.c
+++ b/libmailwatch-core/mailwatch-utils.c
@@ -105,12 +105,6 @@ xfce_mailwatch_custom_button_new(const gchar *text, const 
gchar *icon)
 return btn;
 }
 
-GtkWidget *
-xfce_mailwatch_create_framebox(const gchar *title, GtkWidget **frame_bin)
-{
-return xfce_gtk_frame_box_new(title, frame_bin);
-}
-
 #ifdef HAVE_SSL_SUPPORT
 /* assumes |dest| is allocated 2x |src_len| */
 static void
diff --git a/libmailwatch-core/mailwatch-utils.h 
b/libmailwatch-core/mailwatch-utils.h
index 0c9a917..da395eb 100644
--- a/libmailwatch-core/mailwatch-utils.h
+++ b/libmailwatch-core/mailwatch-utils.h
@@ -32,8 +32,6 @@ typedef enum
 
 GtkWidget *xfce_mailwatch_custom_button_new(const gchar *text,
 const gchar *icon);
-GtkWidget *xfce_mailwatch_create_framebox(const gchar *title,
-  GtkWidget **frame_bin);
 
 gchar *xfce_mailwatch_cram_md5(const gchar *username,
const gchar *password,
diff --git a/libmailwatch-core/mailwatch.c b/libmailwatch-core/mailwatch.c
index 54a8e30

[Xfce4-commits] xfce4-mailwatch-plugin:master Add SSL support CFLAGS and LDFLAGS conditionally

[Ján Sučan]

Updating branch refs/heads/master
 to 3bba0ea4c7b1adbddfef5420786e38f6654a6371 (commit)
   from b5f08056d30ce93b937451587586b4d722b1fbde (commit)

commit 3bba0ea4c7b1adbddfef5420786e38f6654a6371
Author: Ján Sučan su...@runbox.com
Date:   Mon Nov 25 00:22:29 2013 +0100

Add SSL support CFLAGS and LDFLAGS conditionally

Add the flags only when the support is enabled.

 libmailwatch-core/Makefile.am |   16 +---
 panel-plugin/Makefile.am  |8 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am
index 3a28f55..9a626bd 100644
--- a/libmailwatch-core/Makefile.am
+++ b/libmailwatch-core/Makefile.am
@@ -26,15 +26,17 @@ libmailwatch_core_la_SOURCES = \
mailwatch.c \
mailwatch.h
 
-if HAVE_SSL_SUPPORT
-libmailwatch_core_la_SOURCES += \
-   mailwatch-mailbox-gmail.c
-endif
-
 libmailwatch_core_la_CFLAGS = \
$(GTHREAD_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
-   $(GNUTLS_CFLAGS) \
-   $(LIBGCRYPT_CFLAGS) \
$(PLATFORM_CFLAGS)
+
+if HAVE_SSL_SUPPORT
+libmailwatch_core_la_SOURCES += \
+   mailwatch-mailbox-gmail.c
+
+libmailwatch_core_la_CFLAGS += \
+   $(GNUTLS_CFLAGS) \
+   $(LIBGCRYPT_CFLAGS)
+endif
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 69436a0..a47b776 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -36,10 +36,14 @@ libmailwatch_la_LIBADD = \
$(GTHREAD_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UI_LIBS) \
-   $(GNUTLS_LIBS) \
-   $(LIBGCRYPT_LIBS) \
$(EXO_LIBS)
 
+if HAVE_SSL_SUPPORT
+libmailwatch_la_LIBADD += \
+   $(GNUTLS_LIBS) \
+   $(LIBGCRYPT_LIBS)
+endif
+
 #
 # Desktop file
 #
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Create THANKS file

[Ján Sučan]

Updating branch refs/heads/master
 to ff9acf50171bc868e808ebe022f6b9fc5737fc07 (commit)
   from 3bba0ea4c7b1adbddfef5420786e38f6654a6371 (commit)

commit ff9acf50171bc868e808ebe022f6b9fc5737fc07
Author: Ján Sučan su...@runbox.com
Date:   Mon Nov 25 00:32:30 2013 +0100

Create THANKS file

 0 files changed

diff --git a/THANKS b/THANKS
new file mode 100644
index 000..e69de29
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Move translator credits to the THANKS file

[Ján Sučan]

Updating branch refs/heads/master
 to 187fd98cb86054e1e1b1f24edee2ef0c2815de16 (commit)
   from ff9acf50171bc868e808ebe022f6b9fc5737fc07 (commit)

commit 187fd98cb86054e1e1b1f24edee2ef0c2815de16
Author: Ján Sučan su...@runbox.com
Date:   Mon Nov 25 00:39:58 2013 +0100

Move translator credits to the THANKS file

 AUTHORS |   19 +++
 THANKS  |   14 ++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1afccac..061ccdb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,17 +1,4 @@
-Code:
-Brian Tarricone bj...@cornell.edu  (core, plugin, IMAP, POP3, GMail)
-Pasi Orovuo pasi...@gmail.com  (mbox, {mh-,}maildir, bugfixes, logging)
-Ján Sučan su...@runbox.com
+Brian Tarricone bj...@cornell.edu  (core, plugin, IMAP, POP3, GMail)
+Pasi Orovuo pasi...@gmail.com  (mbox, {mh-,}maildir, bugfixes, logging)
+Ján Sučan su...@runbox.com
 
-Translations:
-Pau Rullan Ferragut paurul...@bulma.net  (ca)
-Bernhard Walle bernh...@bwalle.de  (de)
-Fabian Nowak timyst...@aarcor.de  (de)
-Stavros Giannouris stavrosg2...@freemail.gr  (el)
-Piarres Beobide p...@beobide.net  (eu)
-Jari Rahkonen jari.rahko...@pp1.inet.fi  (fi)
-Stephane Roy s...@j2n.net  (fr)
-Ankit Patel ankit...@yahoo.com  (gu)
-Daichi Kawahata dai...@xfce.org  (ja)
-Adriano Winter Bess awb...@gmail.com  (pt_BR)
-Phan Vĩnh Thịnh te...@vnlinux.org  (vi)
diff --git a/THANKS b/THANKS
index e69de29..2d7fc40 100644
--- a/THANKS
+++ b/THANKS
@@ -0,0 +1,14 @@
+Translations
+
+
+Pau Rullan Ferragut paurul...@bulma.net  (ca)
+Bernhard Walle bernh...@bwalle.de  (de)
+Fabian Nowak timyst...@aarcor.de  (de)
+Stavros Giannouris stavrosg2...@freemail.gr  (el)
+Piarres Beobide p...@beobide.net  (eu)
+Jari Rahkonen jari.rahko...@pp1.inet.fi  (fi)
+Stephane Roy s...@j2n.net  (fr)
+Ankit Patel ankit...@yahoo.com  (gu)
+Daichi Kawahata dai...@xfce.org  (ja)
+Adriano Winter Bess awb...@gmail.com  (pt_BR)
+Phan Vĩnh Thịnh te...@vnlinux.org  (vi)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Change exo version requirement

[Ján Sučan]

Updating branch refs/heads/master
 to 1b84c97e46d7efa782ff6f697bbf232c49e25d8e (commit)
   from f340118521ca69d346b5f1596565c51012f6177f (commit)

commit 1b84c97e46d7efa782ff6f697bbf232c49e25d8e
Author: Ján Sučan su...@runbox.com
Date:   Mon Nov 18 23:35:44 2013 +0100

Change exo version requirement

Lower required version of exo library, and thus expand a set of
compile/run time environment configurations.

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index f301656..c62ba7e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -77,7 +77,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.2])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.6.2])
 
 dnl Check for gnutls and libgcrypt support
 enable_ssl_support=no
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Update README file

[Ján Sučan]

Updating branch refs/heads/master
 to 614bff32089f258d4d2c3c97b1b73d507f7f9851 (commit)
   from 5c04bb089a861f2d51fa2f9eef5b070086618852 (commit)

commit 614bff32089f258d4d2c3c97b1b73d507f7f9851
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 11:28:58 2013 +0200

Update README file

Update information about plugin requirements, website, mailing lists
and authors.

 README |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/README b/README
index f8c1c00..7c87004 100644
--- a/README
+++ b/README
@@ -4,6 +4,7 @@
 
 The Xfce4 Mailwatch Plugin is a multi-protocol, multi-mailbox mail watcher.
 Currently, the protocols supported are:
+
   * IMAP (SSL/TLS and cleartext, CRAM-MD5)
   * POP3 (SSL/TLS and cleartext, CRAM-MD5)
   * Mbox mail spool (local)
@@ -12,6 +13,7 @@ Currently, the protocols supported are:
   * Google Mail (GMail) mailbox (remote) (requires gnutls)
 
 Random list of features:
+
   * Multiple folder checking support for IMAP.
   * Independent check intervals for each mailbox.
   * Threaded design; xfce4-panel UI should never freeze or block.
@@ -23,16 +25,18 @@ Random list of features:
 overlay icon to inform the user of errors at a glance.
   * Custom button icons.
 
-gnutls 1.2.0 or greater is optional, but required for SSL/TLS support.  GMail
-requires gnutls.  Sending cleartext passwords across unsecured networks is not
-recommended.  This plugin should work with any Xfce version from 4.2.0 onwards.
+gnutls 1.2.0 or greater and libgcrypt, version 1.2.0 or greater, are optional,
+but required for SSL/TLS support. GMail requires this support. Sending
+cleartext passwords across unsecured networks is not recommended. This plugin
+should work with any Xfce version from 4.8.0 onwards.
 
 See the Mailwatch website for more information and the latest release:
-http://spuriousinterrupt.org/projects/mailwatch
+http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin
 
 Please use the Xfce general discussion list if you have problems:
-http://foo-projects.org/mailman/listinfo/xfce
-Development discussion (if any) takes place on the xfce4-dev list:
-http://foo-projects.org/mailman/listinfo/xfce4-dev
+https://mail.xfce.org/mailman/listinfo/xfce
+Development discussion (if any) takes place on the goodies-dev list:
+https://mail.xfce.org/mailman/listinfo/goodies-dev
 
-The Xfce4 Mailwatch Plugin was written by Brian Tarricone and Pasi Orovuo.
+The Xfce4 Mailwatch Plugin was written by Brian Tarricone, Pasi Orovuo
+and Ján Sučan.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Update AUTHORS file

[Ján Sučan]

Updating branch refs/heads/master
 to 180bb8090c8655a91980d93711780b9c54034bce (commit)
   from 614bff32089f258d4d2c3c97b1b73d507f7f9851 (commit)

commit 180bb8090c8655a91980d93711780b9c54034bce
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 12:07:12 2013 +0200

Update AUTHORS file

 AUTHORS |1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index ed9818b..1afccac 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 Code:
 Brian Tarricone bj...@cornell.edu  (core, plugin, IMAP, POP3, GMail)
 Pasi Orovuo pasi...@gmail.com  (mbox, {mh-,}maildir, bugfixes, logging)
+Ján Sučan su...@runbox.com
 
 Translations:
 Pau Rullan Ferragut paurul...@bulma.net  (ca)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor NEWS file

[Ján Sučan]

Updating branch refs/heads/master
 to da0d8ce906ca37df9cd6b967a99cdce2e293def0 (commit)
   from edd4747d99613a6e6105d0e83cac62b7de7280fb (commit)

commit da0d8ce906ca37df9cd6b967a99cdce2e293def0
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 12:36:48 2013 +0200

Refactor NEWS file

 NEWS |  127 --
 1 file changed, 61 insertions(+), 66 deletions(-)

diff --git a/NEWS b/NEWS
index 9a198f6..d8844ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,66 +1,61 @@
-+---+
-| Mailwatch |
-+---+
-
-Version 1.1.0svn:
-
-  Bugfixes:
-* Fix build when SSL is disabled.
-* Also support gtk-2.12-style tooltips, and make the tooltip auto-update
-  in place if the status changes while the tooltip is active.
-* Fix high CPU usage while checking mail (bug 4494).
-
-
-Version 1.1.0 (14 Sep 2008):
-
-  Bugfixes:
-* Fix a compiler error on some systems (bug 1822).
-* Fix incorrect getaddrinfo() usage breaking use on NetBSD (bug 3767).
-* Fix possible hang when reading IMAP responses when a selected folder
-  is later deleted or unsubscribed.
-* Fix buffer size issues when reading IMAP folder contents (bug 2009).
-* Fix mailcheck interval not getting saved if changed using the
-  keyboard rather than the mouse (bug 2386).
-* Fix problems receiving full commands on IMAP accounts (bug 2416).
-* Fix problems receiving full commands on POP3 accounts (bug 2013).
-* Fix removed new-mail folders sometimes re-adding themselves (bug 2647).
-* Display message in log about possible incorrect username/password
-  when IMAP or POP3 authentication fails (bug 4344).
-* Clean out stale mailbox data when a mailbox is removed.
-
-  Features:
-* Update the new message counts for all mailboxes on startup, rather than
-  waiting for the first interval timeout.
-* Document the behavior of forcing a new messsage count update when the
-  user double-clicks the icon (patch from Maximilian Schleiss).
-* Add experimental IPv6 support.
-* Add an 'Update Now' menu item (bug 3908).
-* Add CRAM-MD5 authentication support for POP3 and IMAP (bug 3420).
-* Add about dialog.
-* Network layer heavily refactored to make code more readable and fix
-  strange timing bugs.  It's much easier to read, maintain, and debug
-  now.  This isn't particularly user-visible, but is notable.
-* Eliminated periodic wakeups to see if it's time to check mail again,
-  instead using a long-running timeout.  A side-effect of this is that
-  the mail-checking threads no longer run all the time, but only when
-  needed.  Should save a little battery life for laptop users, and
-  just be more resource-friendly in general.
-* Allow non-square plugin buttons.
-* Allow deselecting INBOX in the IMAP folder list (bug 4150).
-* Use GtkFileChooserButton for mbox and maildir file/dir entries rather
-  than a GtkEntry+GtkButton.
-
-
-Version 1.0.1 (20 Apr 2006):
-
-  Bugfixes:
-* Fix a possible connection failure when using IMAPS or POP3S.
-* Don't compile in the GMail mailbox type if GNUTLS is not available,
-  as GMail requires an SSL HTTP connection.
-
-
-Version 1.0.0 (31 Jan 2006):
-
-  Initial release.  I feel pretty good about it, thus the 1.0.0
-  designation.  That means there are no bugs.  Seriously.  Ok, not
-  really.
+1.1.0svn
+
+
+ - Fix build when SSL is disabled.
+ - Also support gtk-2.12-style tooltips, and make the tooltip auto-update
+   in place if the status changes while the tooltip is active.
+ - Fix high CPU usage while checking mail (bug 4494).
+
+
+1.1.0 (14 Sep 2008)
+===
+
+ - Fix a compiler error on some systems (bug 1822).
+ - Fix incorrect getaddrinfo() usage breaking use on NetBSD (bug 3767).
+ - Fix possible hang when reading IMAP responses when a selected folder
+   is later deleted or unsubscribed.
+ - Fix buffer size issues when reading IMAP folder contents (bug 2009).
+ - Fix mailcheck interval not getting saved if changed using the
+   keyboard rather than the mouse (bug 2386).
+ - Fix problems receiving full commands on IMAP accounts (bug 2416).
+ - Fix problems receiving full commands on POP3 accounts (bug 2013).
+ - Fix removed new-mail folders sometimes re-adding themselves (bug 2647).
+
+ - Display message in log about possible incorrect username/password
+   when IMAP or POP3 authentication fails (bug 4344).
+ - Clean out stale mailbox data when a mailbox is removed.
+ - Update the new message counts for all mailboxes on startup, rather than
+   waiting for the first interval timeout.
+ - Document the behavior of forcing a new messsage count update when the
+   user double-clicks the icon (patch from Maximilian Schleiss).
+ - Add experimental IPv6 support.
+ - Add an 'Update Now' menu item (bug 3908).
+ - Add CRAM-MD5 authentication support for POP3 and IMAP (bug 3420).
+ - Add about

[Xfce4-commits] xfce4-mailwatch-plugin:master Update NEWS file

[Ján Sučan]

Updating branch refs/heads/master
 to 5c5f6d3c350fc71a4a69a7762c27d941dfc426ab (commit)
   from da0d8ce906ca37df9cd6b967a99cdce2e293def0 (commit)

commit 5c5f6d3c350fc71a4a69a7762c27d941dfc426ab
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 13:07:46 2013 +0200

Update NEWS file

 NEWS |   22 +++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index d8844ac..dd4609d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,26 @@
-1.1.0svn
-
+1.2.0 (24 Oct 2013)
+===
 
+ - Fix recieving data from multiple packets.
+ - Port to libxfce4ui.
+ - Fix compilation and linking with libgcrypt.
+ - Fix compilation error when using gnutls = 3.0.3.
  - Fix build when SSL is disabled.
  - Also support gtk-2.12-style tooltips, and make the tooltip auto-update
in place if the status changes while the tooltip is active.
- - Fix high CPU usage while checking mail (bug 4494).
+ - Fix high CPU usage while checking mail (bug #4494).
+
+ - Add new help dialog with redirection.
+ - Remove a moved documentation.
+ - Add configured features to print.
+ - Use exo icon chooser dialog for icon selection.
+ - Drop the old panel support.
+
+ - Translation updates: Arabic, German, English (Australian), Spanish,
+   French, Croatian, Hungarian, Italian, Japanese, Korean, Dutch, Polish,
+   Portuguese, Portuguese (Brazilian), Russian, Serbian, Turkish, Ukranian,
+   Chinese (China), Chinese (Taiwan).
+ - Translation additions: Bulgarian.
 
 
 1.1.0 (14 Sep 2008)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Regenerate icon cache after icons (un)install

[Ján Sučan]

Updating branch refs/heads/master
 to 2957fd9799817138334e02d567dfa58640f8765e (commit)
   from f980c8cc15e522b24242e292cb87862891003e6f (commit)

commit 2957fd9799817138334e02d567dfa58640f8765e
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 13:54:43 2013 +0200

Regenerate icon cache after icons (un)install

This fixes make distcheck error:

ERROR: files left after uninstall:
./share/icons/hicolor/icon-theme.cache

 icons/Makefile.am |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/icons/Makefile.am b/icons/Makefile.am
index b20b756..ff5313a 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+update-icon-cache:
@-if test -z $(DESTDIR); then \
 echo Updating Gtk icon cache.;   \
 $(gtk_update_icon_cache);  \
@@ -14,3 +14,6 @@ install-data-hook:
 echo ***   $(gtk_update_icon_cache); \
echo ***; \
 fi
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Post release tag bump

[Ján Sučan]

Updating branch refs/heads/master
 to 6ca7f9cee9ec285d3a6a9380cd3961303e951579 (commit)
   from 3ed2f006ff16b0412f00beb3a8b05d25090c9055 (commit)

commit 6ca7f9cee9ec285d3a6a9380cd3961303e951579
Author: Ján Sučan su...@runbox.com
Date:   Thu Oct 24 14:24:45 2013 +0200

Post release tag bump

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index b7905d8..f301656 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,7 +10,7 @@ m4_define([mailwatch_version_minor], [2])
 m4_define([mailwatch_version_micro], [0])
 m4_define([mailwatch_version_nano], []) dnl leave this empty to have no nano 
version
 m4_define([mailwatch_version_build], [@REVISION@])
-m4_define([mailwatch_version_tag], [])
+m4_define([mailwatch_version_tag], [git])
 m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_nano(),
 [], [], [.mailwatch_version_nano()])ifelse(mailwatch_version_tag(), [git], 
[mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Change the plugin website

[Ján Sučan]

Updating branch refs/heads/master
 to 037a7dfd92d6ef3c0db1c4d7f2564c87e2e9b40a (commit)
   from 1fde33cca8909d1be0ab65089332de52758dffb9 (commit)

commit 037a7dfd92d6ef3c0db1c4d7f2564c87e2e9b40a
Author: Ján Sučan su...@runbox.com
Date:   Tue Oct 15 22:03:54 2013 +0200

Change the plugin website

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 6947d50..ca1bb52 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -127,7 +127,7 @@ AC_MSG_RESULT([$PLATFORM_LDFLAGS])
 AC_SUBST([PLATFORM_LDFLAGS])
 
 AC_DEFINE_UNQUOTED([WEBSITE],
-   [http://spuriousinterrupt.org/projects/mailwatch;],
+   
[http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin;],
[The Mailwatch website])
 
 AC_OUTPUT([
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Add new help dialog with redirection

[Ján Sučan]

Updating branch refs/heads/master
 to 25d379cd42bb424847316311d481e43d02a5ace8 (commit)
   from 037a7dfd92d6ef3c0db1c4d7f2564c87e2e9b40a (commit)

commit 25d379cd42bb424847316311d481e43d02a5ace8
Author: Ján Sučan su...@runbox.com
Date:   Tue Oct 15 22:43:34 2013 +0200

Add new help dialog with redirection

xfce_dialog_show_help() function can open only documentation at
compiled-in location (docs.xfce.org), therefore the code was taken
from the xfce-dialogs.c file of libxfce4ui library and modified for
the goodies use.

 panel-plugin/mailwatch-plugin.c |  150 +++
 1 file changed, 136 insertions(+), 14 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 04ee650..1d18fe3 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -18,6 +18,35 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+/*
+ * Source code of functions mailwatch_help_auto_toggled_cb,
+ * mailwatch_help_show_uri, mailwatch_help_response_cb and
+ * mailwatch_help_clicked_cb was taken from the xfce-dialogs.c file of
+ * libxfce4ui library and modified on (dd-mm-):
+ *
+ *   15-10-2013
+ *
+ * Below is the copyright notice of the xfce-dialogs.c code.
+ *
+ * Copyright (c) 2006-2007 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2007  The Xfce Development Team
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
 #ifdef HAVE_CONFIG_H
 #include config.h
 #endif
@@ -71,6 +100,8 @@ typedef struct
 GdkPixbuf *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
 XfceMailwatchLogLevel log_status;
 GtkListStore  *loglist;
+
+gboolean auto_open_online_doc;
 } XfceMailwatchPlugin;
 
 enum {
@@ -512,7 +543,9 @@ mailwatch_read_config(XfcePanelPlugin *plugin,
 mwp-log_lines = xfce_rc_read_int_entry(rc, log_lines, 
DEFAULT_LOG_LINES);
 
 mwp-show_log_status = xfce_rc_read_bool_entry(rc, show_log_status, 
TRUE);
-
+
+mwp-auto_open_online_doc = xfce_rc_read_bool_entry(rc, 
auto_open_online_doc, FALSE);
+
 xfce_rc_close(rc);
 
 xfce_mailwatch_set_config_file(mwp-mailwatch, file);
@@ -555,7 +588,8 @@ mailwatch_write_config(XfcePanelPlugin *plugin,
 
mwp-new_mail_icon?mwp-new_mail_icon:DEFAULT_NEW_MAIL_ICON);
 xfce_rc_write_int_entry(rc, log_lines, mwp-log_lines);
 xfce_rc_write_bool_entry(rc, show_log_status, mwp-show_log_status);
-
+xfce_rc_write_bool_entry(rc, auto_open_online_doc, 
mwp-auto_open_online_doc);
+
 xfce_rc_close(rc);
 
 xfce_mailwatch_set_config_file(mwp-mailwatch, file);
@@ -824,22 +858,110 @@ mailwatch_iconbtn_clicked_cb(GtkWidget   *w,
 }
 
 static void
+mailwatch_help_auto_toggled_cb(GtkWidget *button,
+   gpointer   user_data)
+{
+XfceMailwatchPlugin *mwp = user_data;
+
+if (button != NULL)
+mwp-auto_open_online_doc = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
+else
+mwp-auto_open_online_doc = FALSE;
+}
+
+static void
+mailwatch_help_show_uri(GdkScreen *screen,
+GtkWindow *parent)
+{
+GError *error = NULL;
+
+g_return_if_fail(GDK_IS_SCREEN(screen));
+g_return_if_fail(parent == NULL || GTK_IS_WINDOW(parent));
+
+if (!gtk_show_uri(screen, WEBSITE, gtk_get_current_event_time(), error)) {
+xfce_dialog_show_error(parent, error,
+   _(Failed to open web browser for online 
documentation));
+g_error_free(error);
+}
+}
+
+static void
+mailwatch_help_response_cb(GtkWidget *dialog,
+   gint   response_id,
+   gpointer   user_data)
+{
+XfceMailwatchPlugin *mwp = user_data;
+
+gtk_widget_hide(dialog);
+
+if (response_id == GTK_RESPONSE_YES) {
+mailwatch_help_show_uri(gtk_widget_get_screen(dialog),
+
gtk_window_get_transient_for(GTK_WINDOW(dialog)));
+} else {
+/* Unset auto. */
+mailwatch_help_auto_toggled_cb(NULL, mwp);
+}
+
+gtk_widget_destroy(dialog);
+}
+
+static void
 mailwatch_help_clicked_cb(GtkWidget *w,
   gpointer

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix SIGUSR2 signal handling

[Ján Sučan]

Updating branch refs/heads/master
 to ea8a85352b6e5f01b0f41ac469706465618d7c39 (commit)
   from 32d3845ffa09d1ef7d1051e4e19139ab6860e6e3 (commit)

commit ea8a85352b6e5f01b0f41ac469706465618d7c39
Author: Ján Sučan su...@runbox.com
Date:   Tue Oct 8 16:07:45 2013 +0200

Fix SIGUSR2 signal handling

Delete #ifdef/#endif lines. Required version of libxfce4util library 
contains
needed function(s).

 panel-plugin/mailwatch-plugin.c |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 1f581ed..04ee650 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -1056,7 +1056,6 @@ mailwatch_show_about(XfcePanelPlugin *plugin,
 g_object_unref(G_OBJECT(icon));
 }
 
-#ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
 static void
 mailwatch_handle_sigusr2(gint signal_,
  gpointer user_data)
@@ -1064,7 +1063,6 @@ mailwatch_handle_sigusr2(gint signal_,
 XfceMailwatchPlugin *mwp = user_data;
 xfce_mailwatch_force_update(mwp-mailwatch);
 }
-#endif
 
 static void
 mailwatch_construct(XfcePanelPlugin *plugin)
@@ -1085,7 +1083,6 @@ mailwatch_construct(XfcePanelPlugin *plugin)
 
 mailwatch_read_config(plugin, mwp);
 
-#ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
 if(xfce_posix_signal_handler_init(NULL)) {
 GError *error = NULL;
 
@@ -1097,9 +1094,7 @@ mailwatch_construct(XfcePanelPlugin *plugin)
 g_error_free(error);
 sigaction(SIGUSR2, sa, NULL);
 }
-} else
-#endif
-{
+} else {
 g_warning(failed to init POSIX signal handler helper);
 sigaction(SIGUSR2, sa, NULL);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Add copyright information

[Ján Sučan]

Updating branch refs/heads/master
 to 9b9c63ca8175289bd6c1eaf2af38ea8479a371cf (commit)
   from c4f0cf1f2848dc3c4c11aff95291d26bd8a60f74 (commit)

commit 9b9c63ca8175289bd6c1eaf2af38ea8479a371cf
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 30 19:04:18 2013 +0200

Add copyright information

 libmailwatch-core/mailwatch-mailbox-gmail.c   |1 +
 libmailwatch-core/mailwatch-mailbox-imap.c|1 +
 libmailwatch-core/mailwatch-mailbox-maildir.c |1 +
 libmailwatch-core/mailwatch-mailbox-mbox.c|1 +
 libmailwatch-core/mailwatch-mailbox-mh.c  |1 +
 libmailwatch-core/mailwatch-mailbox-pop3.c|1 +
 libmailwatch-core/mailwatch-net-conn.c|1 +
 libmailwatch-core/mailwatch-utils.c   |1 +
 libmailwatch-core/mailwatch.c |1 +
 panel-plugin/mailwatch-plugin.c   |1 +
 10 files changed, 10 insertions(+)

diff --git a/libmailwatch-core/mailwatch-mailbox-gmail.c 
b/libmailwatch-core/mailwatch-mailbox-gmail.c
index fde3233..2e4b8f9 100644
--- a/libmailwatch-core/mailwatch-mailbox-gmail.c
+++ b/libmailwatch-core/mailwatch-mailbox-gmail.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005-2008 Brian Tarricone bj...@cornell.edu
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/libmailwatch-core/mailwatch-mailbox-imap.c 
b/libmailwatch-core/mailwatch-mailbox-imap.c
index 91ca4c7..47b2229 100644
--- a/libmailwatch-core/mailwatch-mailbox-imap.c
+++ b/libmailwatch-core/mailwatch-mailbox-imap.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005-2008 Brian Tarricone bj...@cornell.edu
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/libmailwatch-core/mailwatch-mailbox-maildir.c 
b/libmailwatch-core/mailwatch-mailbox-maildir.c
index 13a350f..7e3deee 100644
--- a/libmailwatch-core/mailwatch-mailbox-maildir.c
+++ b/libmailwatch-core/mailwatch-mailbox-maildir.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005 Pasi Orovuo pasi...@gmail.com
  *  Copyright (c) 2008 Brian Tarricone bj...@cornell.edu
  *
diff --git a/libmailwatch-core/mailwatch-mailbox-mbox.c 
b/libmailwatch-core/mailwatch-mailbox-mbox.c
index ac8b935..923615b 100644
--- a/libmailwatch-core/mailwatch-mailbox-mbox.c
+++ b/libmailwatch-core/mailwatch-mailbox-mbox.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005 Pasi Orovuo pasi...@gmail.com
  *  Copyright (c) 2005,2008 Brian Tarricone bj...@cornell.edu
  *
diff --git a/libmailwatch-core/mailwatch-mailbox-mh.c 
b/libmailwatch-core/mailwatch-mailbox-mh.c
index a12f717..872f423 100644
--- a/libmailwatch-core/mailwatch-mailbox-mh.c
+++ b/libmailwatch-core/mailwatch-mailbox-mh.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005 Pasi Orovuo pasi...@gmail.com
  *  Copyright (c) 2008 Brian Tarricone bj...@cornell.edu
  *
diff --git a/libmailwatch-core/mailwatch-mailbox-pop3.c 
b/libmailwatch-core/mailwatch-mailbox-pop3.c
index 94c3122..352eced 100644
--- a/libmailwatch-core/mailwatch-mailbox-pop3.c
+++ b/libmailwatch-core/mailwatch-mailbox-pop3.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005-2008 Brian Tarricone bj...@cornell.edu
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index c5e7ce3..3c11583 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2008 Brian Tarricone bj...@cornell.edu
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/libmailwatch-core/mailwatch-utils.c 
b/libmailwatch-core/mailwatch-utils.c
index 912bd13..1771b7d 100644
--- a/libmailwatch-core/mailwatch-utils.c
+++ b/libmailwatch-core/mailwatch-utils.c
@@ -1,5 +1,6 @@
 /*
  *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
+ *  Copyright (c) 2013 Ján Sučan su...@runbox.com
  *  Copyright (c) 2005-2008 Brian Tarricone bj...@cornell.edu
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/libmailwatch-core/mailwatch.c b

[Xfce4-commits] xfce4-mailwatch-plugin:master Add information to the about dialog

[Ján Sučan]

Updating branch refs/heads/master
 to 11f3181d4bd791d265405573b1ce6d1c802dbed8 (commit)
   from 9b9c63ca8175289bd6c1eaf2af38ea8479a371cf (commit)

commit 11f3181d4bd791d265405573b1ce6d1c802dbed8
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 30 19:10:48 2013 +0200

Add information to the about dialog

 panel-plugin/mailwatch-plugin.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index b451e3e..1f581ed 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -1032,7 +1032,8 @@ mailwatch_show_about(XfcePanelPlugin *plugin,
 {
 GdkPixbuf *icon;
 
-const gchar *auth[] = { Brian J. Tarricone bj...@cornell.edu Maintainer, 
Original Author,
+const gchar *auth[] = { Ján Sučan su...@runbox.com Maintainer,
+Brian J. Tarricone bj...@cornell.edu Maintainer, 
Original Author,
 Pasi Orovuo pasi...@gmail.com Developer,
 NULL };
 
@@ -1045,7 +1046,8 @@ mailwatch_show_about(XfcePanelPlugin *plugin,
   version, VERSION,
   comments, _(A featureful mail-checker applet for 
the Xfce Panel),
   website, WEBSITE,
-  copyright, _(Copyright (c) 2005-2008 Brian 
Tarricone\n
+  copyright, _(Copyright (c) 2013 Ján Sučan\n
+ Copyright (c) 2005-2008 Brian 
Tarricone\n
  Copyright (c) 2005 Pasi Orovuo),
   authors, auth,
   NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to 6ba6bd26e43a9c75c595e45336f31c6e2b997ba3 (commit)
   from eb4ee4db22118c3bcbc0c9fc50e5228d172ef7cf (commit)

commit 6ba6bd26e43a9c75c595e45336f31c6e2b997ba3
Author: Ján Sučan su...@runbox.com
Date:   Fri Sep 27 19:30:12 2013 +0200

Refactor the code

 panel-plugin/mailwatch-plugin.c |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index ccec128..d578025 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -48,28 +48,27 @@
 typedef struct
 {
 XfcePanelPlugin *plugin;
-XfceMailwatch *mailwatch;
+XfceMailwatch   *mailwatch;
 
 GtkWidget *button;
 GtkWidget *image;
 
 gboolean newmail_icon_visible;
-guint new_messages;
-GdkPixbuf *pix_normal;
-GdkPixbuf *pix_newmail;
+guintnew_messages;
 
 gchar *click_command;
 gchar *new_messages_command;
-
-gchar *normal_icon;
-gchar *new_mail_icon;
-
-guint log_lines;
-gboolean show_log_status;
 
-GdkPixbuf   *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
-XfceMailwatchLogLevel   log_status;
-GtkListStore*loglist;
+GdkPixbuf *pix_normal;
+GdkPixbuf *pix_newmail;
+gchar *normal_icon;
+gchar *new_mail_icon;
+
+guint log_lines;
+gboolean  show_log_status;
+GdkPixbuf *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
+XfceMailwatchLogLevel log_status;
+GtkListStore  *loglist;
 } XfceMailwatchPlugin;
 
 enum {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Do not use static variable in callback function

[Ján Sučan]

Updating branch refs/heads/master
 to 18336f65cabf7c83f3127d7f55b46627fd664ae1 (commit)
   from 6ba6bd26e43a9c75c595e45336f31c6e2b997ba3 (commit)

commit 18336f65cabf7c83f3127d7f55b46627fd664ae1
Author: Ján Sučan su...@runbox.com
Date:   Fri Sep 27 19:45:06 2013 +0200

Do not use static variable in callback function

 panel-plugin/mailwatch-plugin.c |   38 --
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index d578025..0d2b893 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -63,7 +63,8 @@ typedef struct
 GdkPixbuf *pix_newmail;
 gchar *normal_icon;
 gchar *new_mail_icon;
-
+
+GtkWidget *log_dialog;
 guint log_lines;
 gboolean  show_log_status;
 GdkPixbuf *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
@@ -431,6 +432,7 @@ mailwatch_create(XfcePanelPlugin *plugin)
 gtk_widget_show(mwp-image);
 gtk_container_add(GTK_CONTAINER(mwp-button), mwp-image);
 
+mwp-log_dialog = NULL;
 mwp-loglist = gtk_list_store_new(LOGLIST_N_COLUMNS,
   GDK_TYPE_PIXBUF,
   G_TYPE_STRING,
@@ -614,12 +616,11 @@ static void
 mailwatch_view_log_clicked_cb( GtkWidget *widget, gpointer user_data )
 {
 XfceMailwatchPlugin *mwp = user_data;
-static GtkWidget*dialog = NULL;
 GtkWidget   *vbox, *hbox, *scrollw, *treeview, *button, *lbl,
 *sbtn, *chk;
 
-if(dialog) {
-gtk_window_present(GTK_WINDOW(dialog));
+if (mwp-log_dialog) {
+gtk_window_present(GTK_WINDOW(mwp-log_dialog));
 return;
 }
 
@@ -628,22 +629,22 @@ mailwatch_view_log_clicked_cb( GtkWidget *widget, 
gpointer user_data )
xfce_panel_plugin_get_size(mwp-plugin),
mwp);
 
-dialog = gtk_dialog_new_with_buttons(_( Mailwatch log ),
- 
GTK_WINDOW(gtk_widget_get_toplevel(widget)),
- GTK_DIALOG_MODAL
- | GTK_DIALOG_DESTROY_WITH_PARENT
- | GTK_DIALOG_NO_SEPARATOR,
- NULL);
-gtk_widget_set_size_request(dialog, 480, 240 );
-g_signal_connect(G_OBJECT(dialog), response,
+mwp-log_dialog = gtk_dialog_new_with_buttons(_( Mailwatch log ),
+ 
GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+ GTK_DIALOG_MODAL
+ | 
GTK_DIALOG_DESTROY_WITH_PARENT
+ | GTK_DIALOG_NO_SEPARATOR,
+ NULL);
+gtk_widget_set_size_request(mwp-log_dialog, 480, 240 );
+g_signal_connect(G_OBJECT(mwp-log_dialog), response,
  G_CALLBACK(mailwatch_log_window_response_cb), 
mwp-loglist);
-g_signal_connect_swapped(G_OBJECT(dialog), destroy,
- G_CALLBACK(mailwatch_zero_pointer), dialog);
+g_signal_connect_swapped(G_OBJECT(mwp-log_dialog), destroy,
+ G_CALLBACK(mailwatch_zero_pointer), mwp-log_dialog);
 
 vbox = gtk_vbox_new(FALSE, BORDER/2);
 gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER/2);
 gtk_widget_show(vbox);
-gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)-vbox), vbox, TRUE, TRUE, 0);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(mwp-log_dialog)-vbox), vbox, TRUE, 
TRUE, 0);
 
 scrollw = gtk_scrolled_window_new( NULL, NULL );
 gtk_widget_show( scrollw );
@@ -709,14 +710,15 @@ mailwatch_view_log_clicked_cb( GtkWidget *widget, 
gpointer user_data )
 
 button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
 gtk_widget_show( button );
-gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button,
+gtk_dialog_add_action_widget(GTK_DIALOG(mwp-log_dialog), button,
  XFCE_MAILWATCH_RESPONSE_CLEAR);
 
 button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 gtk_widget_show( button );
-gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button, 
GTK_RESPONSE_ACCEPT);
+gtk_dialog_add_action_widget(GTK_DIALOG(mwp-log_dialog), button,
+GTK_RESPONSE_ACCEPT);
 
-gtk_widget_show(dialog);
+gtk_widget_show(mwp-log_dialog);
 }
 
 static gboolean
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to 7d714c7e6f4d3a70e30f84f2f6a9f88647b33113 (commit)
   from 18336f65cabf7c83f3127d7f55b46627fd664ae1 (commit)

commit 7d714c7e6f4d3a70e30f84f2f6a9f88647b33113
Author: Ján Sučan su...@runbox.com
Date:   Fri Sep 27 20:08:25 2013 +0200

Refactor the code

 panel-plugin/mailwatch-plugin.c |   84 +++
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 0d2b893..8c7c1bc 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -85,8 +85,8 @@ enum {
 LOGLIST_N_COLUMNS
 };
 
-static gboolean mailwatch_set_size(XfcePanelPlugin *plugin,
-   gint wsize,
+static gboolean mailwatch_set_size(XfcePanelPlugin *plugin,
+   gint wsize,
XfceMailwatchPlugin *mwp);
 
 static void
@@ -97,11 +97,12 @@ mailwatch_set_default_config(XfceMailwatchPlugin *mwp)
 }
 
 static void
-mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, gpointer arg,
-gpointer user_data)
+mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
+ gpointer   new_message_count,
+ gpointer   user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
-guint new_messages = GPOINTER_TO_UINT( arg );
+guintnew_messages = GPOINTER_TO_UINT(new_message_count);
 
 if (new_messages == 0  mwp-newmail_icon_visible) {
 mwp-newmail_icon_visible = FALSE;
@@ -158,9 +159,9 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, 
gpointer arg,
 }
 
 static gboolean
-mailwatch_button_press_cb(GtkWidget *w,
+mailwatch_button_press_cb(GtkWidget  *w,
   GdkEventButton *evt,
-  gpointer user_data)
+  gpointeruser_data)
 {
 if (evt-button == MOUSE_BUTTON_MIDDLE)
 gtk_button_pressed(GTK_BUTTON(w));
@@ -169,8 +170,9 @@ mailwatch_button_press_cb(GtkWidget *w,
 }
 
 static gboolean
-mailwatch_button_release_cb(GtkWidget *w, GdkEventButton *evt,
-gpointer user_data)
+mailwatch_button_release_cb(GtkWidget  *w,
+   GdkEventButton *evt,
+   gpointeruser_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 
@@ -201,8 +203,8 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton 
*evt,
 
 static void
 mailwatch_log_message_cb(XfceMailwatch *mailwatch,
- gpointer arg,
- gpointer user_data)
+ gpointer   arg,
+ gpointer   user_data)
 {
 XfceMailwatchLogEntry   *entry = arg;
 XfceMailwatchPlugin *mwp = user_data;
@@ -244,7 +246,9 @@ mailwatch_log_message_cb(XfceMailwatch *mailwatch,
 }
 
 static GdkPixbuf *
-mailwatch_get_mini_icon(GtkWidget *dummy, const gchar *icon_name, gint size)
+mailwatch_get_mini_icon(GtkWidget   *dummy,
+   const gchar *icon_name,
+   gint size)
 {
 GdkPixbuf *pix;
 
@@ -267,7 +271,7 @@ mailwatch_get_mini_icon(GtkWidget *dummy, const gchar 
*icon_name, gint size)
 
 static GdkPixbuf *
 mailwatch_build_icon(XfceMailwatchPlugin *mwp,
- gboolean newmail)
+ gboolean newmail)
 {
 GdkPixbuf *pb = newmail ? gdk_pixbuf_copy(mwp-pix_newmail)
 : gdk_pixbuf_copy(mwp-pix_normal);
@@ -293,7 +297,8 @@ mailwatch_build_icon(XfceMailwatchPlugin *mwp,
 }
 
 static gboolean
-mailwatch_set_size(XfcePanelPlugin *plugin, gint wsize, 
+mailwatch_set_size(XfcePanelPlugin *plugin,
+  gint wsize, 
XfceMailwatchPlugin *mwp)
 {
 gint size, img_width, img_height, width, height, i;
@@ -449,7 +454,8 @@ mailwatch_create(XfcePanelPlugin *plugin)
 }
 
 static void
-mailwatch_read_config(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp)
+mailwatch_read_config(XfcePanelPlugin *plugin,
+ XfceMailwatchPlugin *mwp)
 {
 const char *value;
 gchar *file;
@@ -515,7 +521,8 @@ mailwatch_read_config(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 }
 
 static void
-mailwatch_write_config(XfcePanelPlugin *plugin, XfceMailwatchPlugin *mwp)
+mailwatch_write_config(XfcePanelPlugin *plugin, 
+  XfceMailwatchPlugin *mwp)
 {
 gchar *file;
 XfceRc *rc;
@@ -557,8 +564,9 @@ mailwatch_write_config(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 }
 
 static gboolean
-mailwatch_click_command_focusout_cb(GtkWidget *w, GdkEventFocus *evt,
-gpointer user_data)
+mailwatch_click_command_focusout_cb(GtkWidget *w,
+   GdkEventFocus *evt,
+   gpointer

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to 82d925152c69691eb1467ab94d361781d26802df (commit)
   from 7d714c7e6f4d3a70e30f84f2f6a9f88647b33113 (commit)

commit 82d925152c69691eb1467ab94d361781d26802df
Author: Ján Sučan su...@runbox.com
Date:   Fri Sep 27 21:21:09 2013 +0200

Refactor the code

Replace tabs with spaces.

 panel-plugin/mailwatch-plugin.c |   78 +++
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 8c7c1bc..cc2a74c 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -98,8 +98,8 @@ mailwatch_set_default_config(XfceMailwatchPlugin *mwp)
 
 static void
 mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
- gpointer   new_message_count,
- gpointer   user_data)
+  gpointer   new_message_count,
+  gpointer   user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 guintnew_messages = GPOINTER_TO_UINT(new_message_count);
@@ -171,8 +171,8 @@ mailwatch_button_press_cb(GtkWidget  *w,
 
 static gboolean
 mailwatch_button_release_cb(GtkWidget  *w,
-   GdkEventButton *evt,
-   gpointeruser_data)
+GdkEventButton *evt,
+gpointeruser_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 
@@ -247,8 +247,8 @@ mailwatch_log_message_cb(XfceMailwatch *mailwatch,
 
 static GdkPixbuf *
 mailwatch_get_mini_icon(GtkWidget   *dummy,
-   const gchar *icon_name,
-   gint size)
+const gchar *icon_name,
+gint size)
 {
 GdkPixbuf *pix;
 
@@ -298,7 +298,7 @@ mailwatch_build_icon(XfceMailwatchPlugin *mwp,
 
 static gboolean
 mailwatch_set_size(XfcePanelPlugin *plugin,
-  gint wsize, 
+   gint wsize, 
XfceMailwatchPlugin *mwp)
 {
 gint size, img_width, img_height, width, height, i;
@@ -455,7 +455,7 @@ mailwatch_create(XfcePanelPlugin *plugin)
 
 static void
 mailwatch_read_config(XfcePanelPlugin *plugin,
- XfceMailwatchPlugin *mwp)
+  XfceMailwatchPlugin *mwp)
 {
 const char *value;
 gchar *file;
@@ -522,7 +522,7 @@ mailwatch_read_config(XfcePanelPlugin *plugin,
 
 static void
 mailwatch_write_config(XfcePanelPlugin *plugin, 
-  XfceMailwatchPlugin *mwp)
+   XfceMailwatchPlugin *mwp)
 {
 gchar *file;
 XfceRc *rc;
@@ -565,8 +565,8 @@ mailwatch_write_config(XfcePanelPlugin *plugin,
 
 static gboolean
 mailwatch_click_command_focusout_cb(GtkWidget *w,
-   GdkEventFocus *evt,
-   gpointer   user_data)
+GdkEventFocus *evt,
+gpointer   user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 gchar *command;
@@ -601,7 +601,7 @@ mailwatch_zero_pointer(GtkWidget **w)
 
 static void
 mailwatch_log_lines_changed_cb(GtkWidget *w,
-  gpointer   user_data)
+   gpointer   user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 
@@ -610,7 +610,7 @@ mailwatch_log_lines_changed_cb(GtkWidget *w,
 
 static void
 mailwatch_log_status_toggled_cb(GtkToggleButton *tb,
-   gpointer user_data)
+gpointer user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
 
@@ -624,7 +624,7 @@ mailwatch_log_status_toggled_cb(GtkToggleButton *tb,
 
 static void
 mailwatch_view_log_clicked_cb(GtkWidget *widget,
- gpointer   user_data )
+  gpointer   user_data )
 {
 XfceMailwatchPlugin *mwp = user_data;
 GtkWidget   *vbox, *hbox, *scrollw, *treeview, *button, *lbl,
@@ -641,11 +641,11 @@ mailwatch_view_log_clicked_cb(GtkWidget *widget,
mwp);
 
 mwp-log_dialog = gtk_dialog_new_with_buttons(_( Mailwatch log ),
- 
GTK_WINDOW(gtk_widget_get_toplevel(widget)),
- GTK_DIALOG_MODAL
- | 
GTK_DIALOG_DESTROY_WITH_PARENT
- | GTK_DIALOG_NO_SEPARATOR,
- NULL);
+  
GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+  GTK_DIALOG_MODAL

[Xfce4-commits] xfce4-mailwatch-plugin:master Delete useless statements

[Ján Sučan]

Updating branch refs/heads/master
 to 18ac7b68c8593f5e3bad64d265937462a216bbdd (commit)
   from c03a673ed45e84bff4f503509bd060f9e42619f8 (commit)

commit 18ac7b68c8593f5e3bad64d265937462a216bbdd
Author: Ján Sučan su...@runbox.com
Date:   Fri Sep 20 17:28:54 2013 +0200

Delete useless statements

 panel-plugin/mailwatch-plugin.c |2 --
 1 file changed, 2 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index ac156cc..ccec128 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -908,7 +908,6 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 entry = gtk_entry_new();
 if(mwp-click_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-click_command);
-gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
 gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onclick), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
 G_CALLBACK(mailwatch_click_command_focusout_cb), mwp);
@@ -918,7 +917,6 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 entry = gtk_entry_new();
 if(mwp-new_messages_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-new_messages_command);
-gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
 gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onnewmessages), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
 G_CALLBACK(mailwatch_newmsg_command_focusout_cb), mwp);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Change width of the text entries

[Ján Sučan]

Updating branch refs/heads/master
 to baf0bcda6283934a204953f7c8309ad4a6a9784d (commit)
   from e287bb91ab2e776766da7810de4cd3c6f2b6cff3 (commit)

commit baf0bcda6283934a204953f7c8309ad4a6a9784d
Author: Ján Sučan su...@runbox.com
Date:   Tue Sep 17 20:59:05 2013 +0200

Change width of the text entries

Make the text entries for the external programs selection to be of
equal width.

 panel-plugin/mailwatch-plugin.c |   67 +++
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index c3b4f16..767b1c4 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -885,49 +885,60 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 cfg_page = xfce_mailwatch_get_configuration_page(mwp-mailwatch);
 if(cfg_page)
 gtk_box_pack_start(GTK_BOX(topvbox), GTK_WIDGET(cfg_page), TRUE, TRUE, 
0);
-
+/* External programs. */
+GtkWidget *table;
+GtkWidget *lbl_onclick;
+GtkWidget *lbl_onnewmessages;
+GtkWidget *halign;
+
 frame = xfce_mailwatch_create_framebox(_(External Programs), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
-
-vbox = gtk_vbox_new(FALSE, BORDER/2);
-gtk_widget_show(vbox);
-gtk_container_add(GTK_CONTAINER(frame_bin), vbox);
-
-hbox = gtk_hbox_new(FALSE, BORDER/2);
-gtk_widget_show(hbox);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-lbl = gtk_label_new_with_mnemonic(_(Run _on click:));
-gtk_widget_show(lbl);
-gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
-
+
+table = gtk_table_new(2, 2, FALSE);
+gtk_widget_show(table);
+gtk_container_add(GTK_CONTAINER(frame_bin), table);
+/* External programs - Labels. */
+lbl_onclick = gtk_label_new_with_mnemonic(_(Run _on click:));
+gtk_widget_show(lbl_onclick);
+
+halign = gtk_alignment_new(0, 0.5, 0, 0);
+gtk_widget_show(halign);
+gtk_container_add(GTK_CONTAINER(halign), lbl_onclick);
+gtk_table_attach(GTK_TABLE(table), halign, 0, 1, 0, 1,
+GTK_FILL, GTK_FILL, BORDER / 4, BORDER / 4);
+
+lbl_onnewmessages = gtk_label_new_with_mnemonic(_(Run on new 
_messages:));
+gtk_widget_show(lbl_onnewmessages);
+
+halign = gtk_alignment_new(0, 0.5, 0, 0);
+gtk_widget_show(halign);
+gtk_container_add(GTK_CONTAINER(halign), lbl_onnewmessages);
+gtk_table_attach(GTK_TABLE(table), halign, 0, 1, 1, 2,
+GTK_FILL, GTK_FILL, BORDER / 4, BORDER / 4);
+/* External programs - Entries. */
 entry = gtk_entry_new();
 if(mwp-click_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-click_command);
 gtk_widget_show(entry);
-gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), entry);
+gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
+gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onclick), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
 G_CALLBACK(mailwatch_click_command_focusout_cb), mwp);
-
-hbox = gtk_hbox_new(FALSE, BORDER/2);
-gtk_widget_show(hbox);
-gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-lbl = gtk_label_new_with_mnemonic(_(Run on new _messages:));
-gtk_widget_show(lbl);
-gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, FALSE, 0);
-
+gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1,
+GTK_FILL | GTK_EXPAND, GTK_FILL, BORDER / 4, BORDER / 4);
+
 entry = gtk_entry_new();
 if(mwp-new_messages_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-new_messages_command);
 gtk_widget_show(entry);
-gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
-gtk_label_set_mnemonic_widget(GTK_LABEL(lbl), entry);
+gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
+gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onnewmessages), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
 G_CALLBACK(mailwatch_newmsg_command_focusout_cb), mwp);
-
+gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2,
+GTK_FILL | GTK_EXPAND, GTK_FILL, BORDER / 4, BORDER / 4);
+/* Icons. */
 frame = xfce_mailwatch_create_framebox(_(Icons), frame_bin);
 gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Show widgets after constructing a whole dialog

[Ján Sučan]

Updating branch refs/heads/master
 to c03a673ed45e84bff4f503509bd060f9e42619f8 (commit)
   from baf0bcda6283934a204953f7c8309ad4a6a9784d (commit)

commit c03a673ed45e84bff4f503509bd060f9e42619f8
Author: Ján Sučan su...@runbox.com
Date:   Tue Sep 17 21:29:08 2013 +0200

Show widgets after constructing a whole dialog

 panel-plugin/mailwatch-plugin.c |   27 +--
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 767b1c4..ac156cc 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -859,26 +859,22 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 gtk_window_set_icon_name(GTK_WINDOW(dlg), xfce4-settings);
 
 btn = gtk_button_new_from_stock(GTK_STOCK_HELP);
-gtk_widget_show(btn);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-action_area), btn, FALSE,
FALSE, 0);
 g_signal_connect(G_OBJECT(btn), clicked,
  G_CALLBACK(mailwatch_help_clicked_cb), mwp);
 
 btn = xfce_mailwatch_custom_button_new(_(_View Log...), GTK_STOCK_FIND);
-gtk_widget_show(btn);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-action_area), btn, FALSE,
FALSE, 0);
 g_signal_connect(G_OBJECT(btn), clicked,
  G_CALLBACK(mailwatch_view_log_clicked_cb), mwp);
 
 btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-gtk_widget_show(btn);
 gtk_dialog_add_action_widget(GTK_DIALOG(dlg), btn, GTK_RESPONSE_ACCEPT);
  
 topvbox = gtk_vbox_new(FALSE, BORDER);
 gtk_container_set_border_width(GTK_CONTAINER(topvbox), BORDER - 2);
-gtk_widget_show(topvbox);
 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)-vbox), topvbox,
 TRUE, TRUE, 0);
 
@@ -892,27 +888,19 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 GtkWidget *halign;
 
 frame = xfce_mailwatch_create_framebox(_(External Programs), frame_bin);
-gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
 table = gtk_table_new(2, 2, FALSE);
-gtk_widget_show(table);
 gtk_container_add(GTK_CONTAINER(frame_bin), table);
 /* External programs - Labels. */
 lbl_onclick = gtk_label_new_with_mnemonic(_(Run _on click:));
-gtk_widget_show(lbl_onclick);
-
 halign = gtk_alignment_new(0, 0.5, 0, 0);
-gtk_widget_show(halign);
 gtk_container_add(GTK_CONTAINER(halign), lbl_onclick);
 gtk_table_attach(GTK_TABLE(table), halign, 0, 1, 0, 1,
 GTK_FILL, GTK_FILL, BORDER / 4, BORDER / 4);
 
 lbl_onnewmessages = gtk_label_new_with_mnemonic(_(Run on new 
_messages:));
-gtk_widget_show(lbl_onnewmessages);
-
 halign = gtk_alignment_new(0, 0.5, 0, 0);
-gtk_widget_show(halign);
 gtk_container_add(GTK_CONTAINER(halign), lbl_onnewmessages);
 gtk_table_attach(GTK_TABLE(table), halign, 0, 1, 1, 2,
 GTK_FILL, GTK_FILL, BORDER / 4, BORDER / 4);
@@ -920,7 +908,6 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 entry = gtk_entry_new();
 if(mwp-click_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-click_command);
-gtk_widget_show(entry);
 gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
 gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onclick), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
@@ -931,7 +918,6 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 entry = gtk_entry_new();
 if(mwp-new_messages_command)
 gtk_entry_set_text(GTK_ENTRY(entry), mwp-new_messages_command);
-gtk_widget_show(entry);
 gtk_box_pack_start(GTK_BOX(vbox), entry, TRUE, TRUE, 0);
 gtk_label_set_mnemonic_widget(GTK_LABEL(lbl_onnewmessages), entry);
 g_signal_connect(G_OBJECT(entry), focus-out-event,
@@ -940,62 +926,51 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 GTK_FILL | GTK_EXPAND, GTK_FILL, BORDER / 4, BORDER / 4);
 /* Icons. */
 frame = xfce_mailwatch_create_framebox(_(Icons), frame_bin);
-gtk_widget_show(frame);
 gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0);
 
 sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 
 hbox = gtk_hbox_new(FALSE, BORDER/2);
-gtk_widget_show(hbox);
 gtk_container_add(GTK_CONTAINER(frame_bin), hbox);
 
 btn = gtk_button_new();
 g_object_set_data(G_OBJECT(btn), mailwatch-icontype,
   GINT_TO_POINTER(ICON_TYPE_NORMAL));
-gtk_widget_show(btn);
 gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0);
 g_signal_connect(G_OBJECT(btn), clicked,
  G_CALLBACK(mailwatch_iconbtn_clicked_cb), mwp);
 gtk_size_group_add_widget(sg, btn);
 
 vbox = gtk_vbox_new(FALSE

[Xfce4-commits] xfce4-mailwatch-plugin:master Update TODO list

[Ján Sučan]

Updating branch refs/heads/master
 to c08e32024aa3653186e5b4d77ef7fbe790a1690b (commit)
   from ca47c0a028fde6c69aaeacb763de0198ac559376 (commit)

commit c08e32024aa3653186e5b4d77ef7fbe790a1690b
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 16 12:38:13 2013 +0200

Update TODO list

 TODO |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 243466b..73abfad 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,8 @@
-* for the threaded code, use joinable threads rather than waiting on thread
-  pointers.  though the upside of the current approach is that i could
-  process gtk events in that loop if i wanted
-* gio/thunar-vfs file monitoring support for the local mail spool options
+* Comment the code.
+
+* For the threaded code, use joinable threads rather than waiting on
+  thread pointers. Though the upside of the current approach is that
+  we could process gtk events in that loop if we wanted.
+
+* gio/thunar-vfs file monitoring support for the local mail spool
+  options.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix comparing of signed and unsigned integer

[Ján Sučan]

Updating branch refs/heads/master
 to c1151ebf140f53eb64eea26316dfb4a2f2716a8f (commit)
   from c08e32024aa3653186e5b4d77ef7fbe790a1690b (commit)

commit c1151ebf140f53eb64eea26316dfb4a2f2716a8f
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 16 12:45:00 2013 +0200

Fix comparing of signed and unsigned integer

 libmailwatch-core/mailwatch-mailbox-gmail.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmailwatch-core/mailwatch-mailbox-gmail.c 
b/libmailwatch-core/mailwatch-mailbox-gmail.c
index 7f39c4d..fde3233 100644
--- a/libmailwatch-core/mailwatch-mailbox-gmail.c
+++ b/libmailwatch-core/mailwatch-mailbox-gmail.c
@@ -497,7 +497,7 @@ gmail_config_timeout_spinbutton_changed_cb(GtkSpinButton 
*sb,
gpointer user_data)
 {
 XfceMailwatchGMailMailbox *gmailbox = 
XFCE_MAILWATCH_GMAIL_MAILBOX(user_data);
-gint value = gtk_spin_button_get_value_as_int(sb) * 60;
+guint value = (guint) gtk_spin_button_get_value_as_int(sb) * 60;
 
 if(value == gmailbox-timeout)
 return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix 'uninitialized variable' warnings

[Ján Sučan]

Updating branch refs/heads/master
 to e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56 (commit)
   from c1151ebf140f53eb64eea26316dfb4a2f2716a8f (commit)

commit e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 16 13:07:16 2013 +0200

Fix 'uninitialized variable' warnings

 panel-plugin/mailwatch-plugin.c |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 35beaa8..68f1fde 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -765,9 +765,10 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
 if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
 gchar *filename = 
exo_icon_chooser_dialog_get_icon(EXO_ICON_CHOOSER_DIALOG(chooser));
 if(filename) {
-GtkWidget *label, *image, *vbox;
-GdkPixbuf **icon_pix;
-gchar **icon_path;
+GtkWidget *image, *vbox;
+GtkWidget *label = NULL;
+GdkPixbuf **icon_pix = NULL;
+gchar **icon_path = NULL;
 
 switch(icon_type) {
 case ICON_TYPE_NORMAL:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4 (commit)
   from e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56 (commit)

commit 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4
Author: Ján Sučan su...@runbox.com
Date:   Tue Sep 17 01:37:24 2013 +0200

Refactor the code

 panel-plugin/mailwatch-plugin.c |  109 ---
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 68f1fde..9a5da55 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -103,7 +103,7 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, 
gpointer arg,
 XfceMailwatchPlugin *mwp = user_data;
 guint new_messages = GPOINTER_TO_UINT( arg );
 
-if(new_messages == 0  mwp-newmail_icon_visible) {
+if (new_messages == 0  mwp-newmail_icon_visible) {
 mwp-newmail_icon_visible = FALSE;
 mwp-new_messages = 0;
 mailwatch_set_size(mwp-plugin,
@@ -111,14 +111,14 @@ mailwatch_new_messages_changed_cb(XfceMailwatch 
*mailwatch, gpointer arg,
mwp);
 gtk_widget_set_tooltip_text(mwp-button, _(No new mail));
 gtk_widget_trigger_tooltip_query(mwp-button);
-} else if(new_messages  0) {
-if(!mwp-newmail_icon_visible) {
+} else if (new_messages  0) {
+if (!mwp-newmail_icon_visible) {
 mwp-newmail_icon_visible = TRUE;
 mailwatch_set_size(mwp-plugin,
xfce_panel_plugin_get_size(mwp-plugin),
mwp);
 }
-if(new_messages != mwp-new_messages) {
+if (new_messages != mwp-new_messages) {
 GString *ttip_str = g_string_sized_new(64);
 gchar **mailbox_names = NULL;
 guint *new_message_counts = NULL;
@@ -132,8 +132,8 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, 
gpointer arg,
 
 xfce_mailwatch_get_new_message_breakdown(mwp-mailwatch,
 mailbox_names, new_message_counts);
-for(i = 0; mailbox_names[i]; i++) {
-if(new_message_counts[i]  0) {
+for (i = 0; mailbox_names[i]; i++) {
+if (new_message_counts[i]  0) {
 g_string_append_c(ttip_str, '\n');
 g_string_append_printf(ttip_str,
Q_(tells how many new messages in 
each mailbox|%d in %s),
@@ -149,7 +149,7 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch, 
gpointer arg,
 gtk_widget_trigger_tooltip_query(mwp-button);
 g_string_free(ttip_str, TRUE);
 
-if(mwp-new_messages_command)
+if (mwp-new_messages_command)
 xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
   mwp-new_messages_command,
   FALSE, FALSE, NULL);
@@ -162,7 +162,7 @@ mailwatch_button_press_cb(GtkWidget *w,
   GdkEventButton *evt,
   gpointer user_data)
 {
-if(evt-button == 2)
+if (evt-button == 2)
 gtk_button_pressed(GTK_BUTTON(w));
 
 return FALSE;
@@ -174,14 +174,14 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton 
*evt,
 {
 XfceMailwatchPlugin *mwp = user_data;
 
-if(evt-x = w-allocation.x
-evt-x  w-allocation.x + w-allocation.width
-evt-y = w-allocation.y
-evt-y  w-allocation.y + w-allocation.height)
+if (evt-x = w-allocation.x
+ evt-x  w-allocation.x + w-allocation.width
+ evt-y = w-allocation.y
+ evt-y  w-allocation.y + w-allocation.height)
 {
-switch(evt-button) {
+switch (evt-button) {
 case MOUSE_BUTTON_LEFT:
-if(mwp-click_command  *mwp-click_command)
+if (mwp-click_command  *mwp-click_command)
 xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
   mwp-click_command,
   FALSE, FALSE, NULL);
@@ -193,7 +193,7 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton 
*evt,
 }
 }
 
-if(evt-button == MOUSE_BUTTON_MIDDLE)
+if (evt-button == MOUSE_BUTTON_MIDDLE)
 gtk_button_released(GTK_BUTTON(w));
 
 return FALSE;
@@ -210,13 +210,13 @@ mailwatch_log_message_cb(XfceMailwatch *mailwatch,
 struct tm ltm;
 gchar time_str[256] = , *new_message = NULL;
 
-if(localtime_r(entry-timestamp, ltm))
+if (localtime_r(entry-timestamp, ltm))
 strftime(time_str, 256, %x %T:, ltm);
 
-if(entry-level = XFCE_MAILWATCH_N_LOG_LEVELS)
+if (entry-level = XFCE_MAILWATCH_N_LOG_LEVELS)
 entry-level = XFCE_MAILWATCH_N_LOG_LEVELS - 1

[Xfce4-commits] xfce4-mailwatch-plugin:master Use identifiers instead of magic numbers

[Ján Sučan]

Updating branch refs/heads/master
 to e287bb91ab2e776766da7810de4cd3c6f2b6cff3 (commit)
   from 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4 (commit)

commit e287bb91ab2e776766da7810de4cd3c6f2b6cff3
Author: Ján Sučan su...@runbox.com
Date:   Tue Sep 17 01:42:33 2013 +0200

Use identifiers instead of magic numbers

 panel-plugin/mailwatch-plugin.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 9a5da55..c3b4f16 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -162,7 +162,7 @@ mailwatch_button_press_cb(GtkWidget *w,
   GdkEventButton *evt,
   gpointer user_data)
 {
-if (evt-button == 2)
+if (evt-button == MOUSE_BUTTON_MIDDLE)
 gtk_button_pressed(GTK_BUTTON(w));
 
 return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Add configured features to print

[Ján Sučan]

Updating branch refs/heads/master
 to 52bed2f3ab28b8a2161342de76ff1df09e80854b (commit)
   from 6c841f7d2714427a1fbd407575a6ff965d1effb2 (commit)

commit 52bed2f3ab28b8a2161342de76ff1df09e80854b
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 15 10:34:24 2013 +0200

Add configured features to print

 configure.ac.in |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 97a7ecf..6fae290 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -80,17 +80,18 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], 
[4.8.0])
 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.2])
 
 dnl Check for gnutls and libgcrypt support
+enable_ssl_support=no
 XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
 [gnutls and libgcrypt support for secure IMAP/POP3 connections], [yes])
 if test x$GNUTLS_FOUND = xyes; then
 dnl libgcrypt does not provide a pkg-config file
 AM_PATH_LIBGCRYPT([1.2.0], LIBGCRYPT_FOUND=yes, LIBGCRYPT_FOUND=no)
 if test x$LIBGCRYPT_FOUND = xyes; then
+enable_ssl_support=yes
 AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
 fi
 fi
-AM_CONDITIONAL([HAVE_SSL_SUPPORT],
-   [test x$GNUTLS_FOUND = xyes -a x$LIBGCRYPT_FOUND = 
xyes])
+AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test x$enable_ssl_support = xyes])
 
 dnl Check for IPv6 support
 AC_MSG_CHECKING([whether to support IPv6])
@@ -151,3 +152,6 @@ echo Build Configuration:
 echo
 echo * Debug Support:$enable_debug
 echo
+echo * IPv6 Support: $enable_ipv6_support
+echo * SSL Support:  $enable_ssl_support
+echo
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix makefile subdirs list

[Ján Sučan]

Updating branch refs/heads/master
 to 5caeff4351472f52f013ff249edbf480dfdcbe1a (commit)
   from ed7208d72a9a4ab44e32b4269b723a3a8a506290 (commit)

commit 5caeff4351472f52f013ff249edbf480dfdcbe1a
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 15 10:59:17 2013 +0200

Fix makefile subdirs list

 Makefile.am |1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ff7db3d..b208f1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = \
-   doc \
icons \
libmailwatch-core \
panel-plugin \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Use more standard plugin library file name

[Ján Sučan]

Updating branch refs/heads/master
 to ca47c0a028fde6c69aaeacb763de0198ac559376 (commit)
   from 5caeff4351472f52f013ff249edbf480dfdcbe1a (commit)

commit ca47c0a028fde6c69aaeacb763de0198ac559376
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 15 12:53:10 2013 +0200

Use more standard plugin library file name

 panel-plugin/Makefile.am  |   12 ++--
 panel-plugin/mailwatch.desktop.in |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index b63c642..69436a0 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -8,15 +8,15 @@ AM_CPPFLAGS = \
 plugindir = $(libdir)/xfce4/panel/plugins
 
 plugin_LTLIBRARIES = \
-   libmailwatch-plugin.la
+   libmailwatch.la
 
-libmailwatch_plugin_la_SOURCES = \
+libmailwatch_la_SOURCES = \
mailwatch-plugin.c
 
-libmailwatch_plugin_la_DEPENDENCIES = \
+libmailwatch_la_DEPENDENCIES = \
$(top_builddir)/libmailwatch-core/libmailwatch-core.la
 
-libmailwatch_plugin_la_CFLAGS = \
+libmailwatch_la_CFLAGS = \
-I$(top_srcdir)/libmailwatch-core \
$(GTHREAD_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
@@ -24,14 +24,14 @@ libmailwatch_plugin_la_CFLAGS = \
$(EXO_CFLAGS) \
$(PLATFORM_CFLAGS)
 
-libmailwatch_plugin_la_LDFLAGS = \
+libmailwatch_la_LDFLAGS = \
-avoid-version \
-module \
-no-undefined \
-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
$(PLATFORM_LDFLAGS)
 
-libmailwatch_plugin_la_LIBADD = \
+libmailwatch_la_LIBADD = \
$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
$(GTHREAD_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
diff --git a/panel-plugin/mailwatch.desktop.in 
b/panel-plugin/mailwatch.desktop.in
index e92b5e5..fc359b8 100644
--- a/panel-plugin/mailwatch.desktop.in
+++ b/panel-plugin/mailwatch.desktop.in
@@ -4,5 +4,5 @@ Encoding=UTF-8
 _Name=Mail Watcher
 _Comment=Check mail from multiple mailboxes
 Icon=xfce-mail
-X-XFCE-Module=mailwatch-plugin
+X-XFCE-Module=mailwatch
 X-XFCE-Internal=false
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Merge branch 'jansucan/build'

[Ján Sučan]

Updating branch refs/heads/master
 to f4e901eb256f99585fcfdc0bfbaa1452a4b3e37e (commit)
   from da287e6157f4a889a85efd6730cb63af850d0bee (commit)

commit f4e901eb256f99585fcfdc0bfbaa1452a4b3e37e
Merge: da287e6 c9aa7a4
Author: Ján Sučan su...@runbox.com
Date:   Thu Sep 12 11:29:09 2013 +0200

Merge branch 'jansucan/build'

commit c9aa7a4b835ad542d09f6449811a12714926212c
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 9 14:33:32 2013 +0200

Update build files and layout of the files

This update was inspired by the xfce4-sample-plugin.

 Makefile.am  |   28 ++
 configure.ac.in  |  138 --
 icons/48x48/Makefile.am  |7 ++
 {pixmaps = icons/48x48}/xfce-newmail.png|  Bin 1494 - 1494 bytes
 {pixmaps = icons/48x48}/xfce-nomail.png |  Bin 1314 - 1314 bytes
 icons/Makefile.am|   16 +++
 icons/scalable/Makefile.am   |7 ++
 {pixmaps = icons/scalable}/xfce-newmail.svg |0
 {pixmaps = icons/scalable}/xfce-nomail.svg  |0
 libmailwatch-core/Makefile.am|   24 +++--
 libmailwatch-core/mailwatch.c|2 +-
 panel-plugin/Makefile.am |   26 +++--
 panel-plugin/mailwatch-plugin.c  |2 +-
 pixmaps/Makefile.am  |   20 
 14 files changed, 156 insertions(+), 114 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7d75959..ff7db3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,12 @@
-@SET_MAKE@
-
 SUBDIRS = \
doc \
+   icons \
libmailwatch-core \
panel-plugin \
-   pixmaps \
po
 
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac
-   [ -x $(top_srcdir)/autogen.sh ]  cd $(top_srcdir)  NOCONFIGURE=1 
./autogen.sh || /bin/true
-
-html:
-   $(MAKE) -C doc html
+distclean-local:
+   rm -rf *.cache *~
 
 .PHONY: ChangeLog
 
@@ -25,21 +20,10 @@ dist-hook: ChangeLog
 EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
-   intltool-update.in \
-   TODO
+   intltool-update.in
 
 DISTCLEANFILES = \
intltool-extract \
intltool-merge \
-   intltool-update
-
-checksums: distcheck
-   sha1sum $(PACKAGE)-$(VERSION).tar.bz2  
$(PACKAGE)-$(VERSION).tar.bz2.sha1.asc
-
-gpg-sign: checksums
-   gpg -b --armor $(PACKAGE)-$(VERSION).tar.bz2
-
-release: gpg-sign
-   -mkdir releases/
-   mv $(PACKAGE)-$(VERSION).tar.bz2* releases/
-   -rm $(PACKAGE)-$(VERSION).tar.gz
+   intltool-update \
+   intltool-update-tmp
diff --git a/configure.ac.in b/configure.ac.in
index 7c36b24..d2ad9a6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,72 +1,84 @@
-dnl configure.ac.in
 dnl
 dnl xfce4-mailwatch-plugin - a mail notification plugin for the xfce4 panel
 dnl
 
-dnl version info
+dnl ***
+dnl *** Version information ***
+dnl ***
 m4_define([mailwatch_version_major], [1])
 m4_define([mailwatch_version_minor], [1])
 m4_define([mailwatch_version_micro], [0])
+m4_define([mailwatch_version_nano], []) dnl leave this empty to have no nano 
version
 m4_define([mailwatch_version_build], [@REVISION@])
 m4_define([mailwatch_version_tag], [git])
-m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [git], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
+m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_nano(),
 [], [], [.mailwatch_version_nano()])ifelse(mailwatch_version_tag(), [git], 
[mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
-dnl init autoconf
-AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
-[http://bugzilla.xfce.org/])
+dnl ***
+dnl *** Initialize autoconf ***
+dnl ***
+AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version], 
[http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
+AC_REVISION([mailwatch_version_build])
 
-dnl init automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+dnl ***
+dnl *** Initialize automake ***
+dnl ***
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
-
-dnl check for basic programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_INTLTOOL([0.31], [no-xml])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl **
+dnl *** Initialize libtool ***
+dnl **
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-dnl check for standard header files

[Xfce4-commits] xfce4-mailwatch-plugin:master Update build files and layout of the files

[Ján Sučan]

Updating branch refs/heads/master
 to c9aa7a4b835ad542d09f6449811a12714926212c (commit)
   from a823536b0509c6f4e19bedbc92abf3a6bea30941 (commit)

commit c9aa7a4b835ad542d09f6449811a12714926212c
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 9 14:33:32 2013 +0200

Update build files and layout of the files

This update was inspired by the xfce4-sample-plugin.

 Makefile.am  |   28 ++
 configure.ac.in  |  138 --
 icons/48x48/Makefile.am  |7 ++
 {pixmaps = icons/48x48}/xfce-newmail.png|  Bin 1494 - 1494 bytes
 {pixmaps = icons/48x48}/xfce-nomail.png |  Bin 1314 - 1314 bytes
 icons/Makefile.am|   16 +++
 icons/scalable/Makefile.am   |7 ++
 {pixmaps = icons/scalable}/xfce-newmail.svg |0
 {pixmaps = icons/scalable}/xfce-nomail.svg  |0
 libmailwatch-core/Makefile.am|   24 +++--
 libmailwatch-core/mailwatch.c|2 +-
 panel-plugin/Makefile.am |   26 +++--
 panel-plugin/mailwatch-plugin.c  |2 +-
 pixmaps/Makefile.am  |   20 
 14 files changed, 156 insertions(+), 114 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7d75959..ff7db3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,12 @@
-@SET_MAKE@
-
 SUBDIRS = \
doc \
+   icons \
libmailwatch-core \
panel-plugin \
-   pixmaps \
po
 
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac
-   [ -x $(top_srcdir)/autogen.sh ]  cd $(top_srcdir)  NOCONFIGURE=1 
./autogen.sh || /bin/true
-
-html:
-   $(MAKE) -C doc html
+distclean-local:
+   rm -rf *.cache *~
 
 .PHONY: ChangeLog
 
@@ -25,21 +20,10 @@ dist-hook: ChangeLog
 EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
-   intltool-update.in \
-   TODO
+   intltool-update.in
 
 DISTCLEANFILES = \
intltool-extract \
intltool-merge \
-   intltool-update
-
-checksums: distcheck
-   sha1sum $(PACKAGE)-$(VERSION).tar.bz2  
$(PACKAGE)-$(VERSION).tar.bz2.sha1.asc
-
-gpg-sign: checksums
-   gpg -b --armor $(PACKAGE)-$(VERSION).tar.bz2
-
-release: gpg-sign
-   -mkdir releases/
-   mv $(PACKAGE)-$(VERSION).tar.bz2* releases/
-   -rm $(PACKAGE)-$(VERSION).tar.gz
+   intltool-update \
+   intltool-update-tmp
diff --git a/configure.ac.in b/configure.ac.in
index 7c36b24..d2ad9a6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,72 +1,84 @@
-dnl configure.ac.in
 dnl
 dnl xfce4-mailwatch-plugin - a mail notification plugin for the xfce4 panel
 dnl
 
-dnl version info
+dnl ***
+dnl *** Version information ***
+dnl ***
 m4_define([mailwatch_version_major], [1])
 m4_define([mailwatch_version_minor], [1])
 m4_define([mailwatch_version_micro], [0])
+m4_define([mailwatch_version_nano], []) dnl leave this empty to have no nano 
version
 m4_define([mailwatch_version_build], [@REVISION@])
 m4_define([mailwatch_version_tag], [git])
-m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [git], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
+m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_nano(),
 [], [], [.mailwatch_version_nano()])ifelse(mailwatch_version_tag(), [git], 
[mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
-dnl init autoconf
-AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
-[http://bugzilla.xfce.org/])
+dnl ***
+dnl *** Initialize autoconf ***
+dnl ***
+AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version], 
[http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
+AC_REVISION([mailwatch_version_build])
 
-dnl init automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+dnl ***
+dnl *** Initialize automake ***
+dnl ***
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
-
-dnl check for basic programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_INTLTOOL([0.31], [no-xml])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl **
+dnl *** Initialize libtool ***
+dnl **
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-dnl check for standard header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h math.h netdb.h netinet/in.h \
-  signal.h stddef.h string.h sys/select.h \
-  sys/socket.h sys/stat.h sys

[Xfce4-commits] xfce4-mailwatch-plugin:master Use exo icon chooser dialog for icon selection

[Ján Sučan]

Updating branch refs/heads/master
 to 5908aa74ca09ae8923b1caa533f9997046d9c64e (commit)
   from f4e901eb256f99585fcfdc0bfbaa1452a4b3e37e (commit)

commit 5908aa74ca09ae8923b1caa533f9997046d9c64e
Author: Ján Sučan su...@runbox.com
Date:   Thu Sep 12 12:14:53 2013 +0200

Use exo icon chooser dialog for icon selection

 configure.ac.in |1 +
 panel-plugin/Makefile.am|4 +++-
 panel-plugin/mailwatch-plugin.c |   28 +---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d2ad9a6..97a7ecf 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -77,6 +77,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.2])
 
 dnl Check for gnutls and libgcrypt support
 XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 251bdf9..b63c642 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -21,6 +21,7 @@ libmailwatch_plugin_la_CFLAGS = \
$(GTHREAD_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
+   $(EXO_CFLAGS) \
$(PLATFORM_CFLAGS)
 
 libmailwatch_plugin_la_LDFLAGS = \
@@ -36,7 +37,8 @@ libmailwatch_plugin_la_LIBADD = \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(GNUTLS_LIBS) \
-   $(LIBGCRYPT_LIBS)
+   $(LIBGCRYPT_LIBS) \
+   $(EXO_LIBS)
 
 #
 # Desktop file
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 1d1c9e1..35beaa8 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -32,6 +32,7 @@
 #include libxfce4util/libxfce4util.h
 #include libxfce4ui/libxfce4ui.h
 #include libxfce4panel/libxfce4panel.h
+#include exo/exo.h
 
 #include mailwatch.h
 #include mailwatch-mailbox.h
@@ -741,15 +742,28 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
 g_return_if_fail(icon_type == ICON_TYPE_NORMAL || icon_type == 
ICON_TYPE_NEW_MAIL);
 
 toplevel = gtk_widget_get_toplevel(w);
-chooser = gtk_file_chooser_dialog_new(_(Select Icon),
-  GTK_WINDOW(toplevel),
-  GTK_FILE_CHOOSER_ACTION_OPEN,
-  GTK_STOCK_CANCEL, 
GTK_RESPONSE_CANCEL,
-  GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-  NULL);
+chooser = exo_icon_chooser_dialog_new (_(Select Icon),
+  
GTK_WINDOW(gtk_widget_get_toplevel(toplevel)),
+  GTK_STOCK_CANCEL, 
GTK_RESPONSE_CANCEL,
+  GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+  NULL);
+gtk_dialog_set_default_response(GTK_DIALOG(chooser), GTK_RESPONSE_ACCEPT);
+/* Preselect actually used icon */
+switch(icon_type) {
+case ICON_TYPE_NORMAL:
+exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser),
+ exo_str_is_empty (mwp-normal_icon) ? 
+ DEFAULT_NORMAL_ICON : 
mwp-normal_icon);
+break;
+case ICON_TYPE_NEW_MAIL:
+exo_icon_chooser_dialog_set_icon (EXO_ICON_CHOOSER_DIALOG (chooser),
+ exo_str_is_empty (mwp-new_mail_icon) 
?
+ DEFAULT_NEW_MAIL_ICON : 
mwp-new_mail_icon);
+break;
+}
 
 if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
-gchar *filename = 
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
+gchar *filename = 
exo_icon_chooser_dialog_get_icon(EXO_ICON_CHOOSER_DIALOG(chooser));
 if(filename) {
 GtkWidget *label, *image, *vbox;
 GdkPixbuf **icon_pix;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:jansucan/build Creating branch jansucan/build

[Ján Sučan]

Updating branch refs/heads/jansucan/build
 as new branch
 to c9aa7a4b835ad542d09f6449811a12714926212c (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/jansucan/build

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:jansucan/build Update build files and layout of the files

[Ján Sučan]

Updating branch refs/heads/jansucan/build
 to c9aa7a4b835ad542d09f6449811a12714926212c (commit)
   from a823536b0509c6f4e19bedbc92abf3a6bea30941 (commit)

commit c9aa7a4b835ad542d09f6449811a12714926212c
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 9 14:33:32 2013 +0200

Update build files and layout of the files

This update was inspired by the xfce4-sample-plugin.

 Makefile.am  |   28 ++
 configure.ac.in  |  138 --
 icons/48x48/Makefile.am  |7 ++
 {pixmaps = icons/48x48}/xfce-newmail.png|  Bin 1494 - 1494 bytes
 {pixmaps = icons/48x48}/xfce-nomail.png |  Bin 1314 - 1314 bytes
 icons/Makefile.am|   16 +++
 icons/scalable/Makefile.am   |7 ++
 {pixmaps = icons/scalable}/xfce-newmail.svg |0
 {pixmaps = icons/scalable}/xfce-nomail.svg  |0
 libmailwatch-core/Makefile.am|   24 +++--
 libmailwatch-core/mailwatch.c|2 +-
 panel-plugin/Makefile.am |   26 +++--
 panel-plugin/mailwatch-plugin.c  |2 +-
 pixmaps/Makefile.am  |   20 
 14 files changed, 156 insertions(+), 114 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7d75959..ff7db3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,12 @@
-@SET_MAKE@
-
 SUBDIRS = \
doc \
+   icons \
libmailwatch-core \
panel-plugin \
-   pixmaps \
po
 
-$(top_srcdir)/configure: $(top_srcdir)/configure.ac
-   [ -x $(top_srcdir)/autogen.sh ]  cd $(top_srcdir)  NOCONFIGURE=1 
./autogen.sh || /bin/true
-
-html:
-   $(MAKE) -C doc html
+distclean-local:
+   rm -rf *.cache *~
 
 .PHONY: ChangeLog
 
@@ -25,21 +20,10 @@ dist-hook: ChangeLog
 EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
-   intltool-update.in \
-   TODO
+   intltool-update.in
 
 DISTCLEANFILES = \
intltool-extract \
intltool-merge \
-   intltool-update
-
-checksums: distcheck
-   sha1sum $(PACKAGE)-$(VERSION).tar.bz2  
$(PACKAGE)-$(VERSION).tar.bz2.sha1.asc
-
-gpg-sign: checksums
-   gpg -b --armor $(PACKAGE)-$(VERSION).tar.bz2
-
-release: gpg-sign
-   -mkdir releases/
-   mv $(PACKAGE)-$(VERSION).tar.bz2* releases/
-   -rm $(PACKAGE)-$(VERSION).tar.gz
+   intltool-update \
+   intltool-update-tmp
diff --git a/configure.ac.in b/configure.ac.in
index 7c36b24..d2ad9a6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,72 +1,84 @@
-dnl configure.ac.in
 dnl
 dnl xfce4-mailwatch-plugin - a mail notification plugin for the xfce4 panel
 dnl
 
-dnl version info
+dnl ***
+dnl *** Version information ***
+dnl ***
 m4_define([mailwatch_version_major], [1])
 m4_define([mailwatch_version_minor], [1])
 m4_define([mailwatch_version_micro], [0])
+m4_define([mailwatch_version_nano], []) dnl leave this empty to have no nano 
version
 m4_define([mailwatch_version_build], [@REVISION@])
 m4_define([mailwatch_version_tag], [git])
-m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [git], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
+m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_nano(),
 [], [], [.mailwatch_version_nano()])ifelse(mailwatch_version_tag(), [git], 
[mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
-dnl init autoconf
-AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
-[http://bugzilla.xfce.org/])
+dnl ***
+dnl *** Initialize autoconf ***
+dnl ***
+AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version], 
[http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
+AC_REVISION([mailwatch_version_build])
 
-dnl init automake
-AM_INIT_AUTOMAKE([dist-bzip2])
+dnl ***
+dnl *** Initialize automake ***
+dnl ***
+AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE
-
-dnl check for UNIX variants
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
-
-dnl check for basic programs
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_INTLTOOL([0.31], [no-xml])
+AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl **
+dnl *** Initialize libtool ***
+dnl **
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static])
 
-dnl check for standard header files
-AC_HEADER_STDC
-AC_CHECK_HEADERS([errno.h fcntl.h math.h netdb.h netinet/in.h \
-  signal.h stddef.h string.h sys/select.h \
-  sys/socket.h sys

[Xfce4-commits] xfce4-mailwatch-plugin:master Change plugindir location

[Ján Sučan]

Updating branch refs/heads/master
 to a823536b0509c6f4e19bedbc92abf3a6bea30941 (commit)
   from 0370085a70db6e33201290454b966bac91d8aa1e (commit)

commit a823536b0509c6f4e19bedbc92abf3a6bea30941
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 9 00:46:56 2013 +0200

Change plugindir location

 panel-plugin/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index d966700..0263bc7 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,7 +1,7 @@
 #
 # Mailwatch plugin
 #
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
 
 plugin_LTLIBRARIES = \
libmailwatch-plugin.la
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code

[Ján Sučan]

Updating branch refs/heads/master
 to a5fbafea64b02e8dbd457d01a0108c98128a5b71 (commit)
   from b5fdda1f3dbdf59bd861cce64362c5f5af12139d (commit)

commit a5fbafea64b02e8dbd457d01a0108c98128a5b71
Author: Ján Sučan su...@runbox.com
Date:   Mon Sep 2 23:04:12 2013 +0200

Refactor the code

Refactor the mailwatch_iconbtn_clicked_cb() function code.

 panel-plugin/mailwatch-plugin.c |   85 +++
 1 file changed, 33 insertions(+), 52 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 38bb9a3..d15e1a1 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -734,9 +734,9 @@ mailwatch_newmsg_command_focusout_cb(GtkWidget *w, 
GdkEventFocus *evt,
 static void
 mailwatch_iconbtn_clicked_cb(GtkWidget *w, XfceMailwatchPlugin *mwp)
 {
+GtkWidget *chooser, *toplevel;
 gint icon_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),
mailwatch-icontype));
-GtkWidget *chooser, *toplevel;
 
 g_return_if_fail(icon_type == ICON_TYPE_NORMAL || icon_type == 
ICON_TYPE_NEW_MAIL);
 
@@ -751,59 +751,40 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
 if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
 gchar *filename = 
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
 if(filename) {
+GtkWidget *label, *image, *vbox;
+GdkPixbuf **icon_pix;
+gchar **icon_path;
+
 switch(icon_type) {
-case ICON_TYPE_NORMAL:
-{
-GtkWidget *vbox, *img, *lbl;
-
-g_free(mwp-normal_icon);
-mwp-normal_icon = filename;
-mailwatch_set_size(mwp-plugin, 
-xfce_panel_plugin_get_size(mwp-plugin), mwp);
-
-gtk_container_remove(GTK_CONTAINER(w),
- gtk_bin_get_child(GTK_BIN(w)));
-
-vbox = gtk_vbox_new(FALSE, BORDER/2);
-gtk_widget_show(vbox);
-gtk_container_add(GTK_CONTAINER(w), vbox);
-
-img = gtk_image_new_from_pixbuf(mwp-pix_normal);
-gtk_widget_show(img);
-gtk_box_pack_start(GTK_BOX(vbox), img, TRUE, TRUE, 0);
-
-lbl = gtk_label_new_with_mnemonic(_(_Normal));
-gtk_widget_show(lbl);
-gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 
0);
-}
-break;
-
-case ICON_TYPE_NEW_MAIL:
-{
-GtkWidget *vbox, *img, *lbl;
-
-g_free(mwp-new_mail_icon);
-mwp-new_mail_icon = filename;
-mailwatch_set_size(mwp-plugin, 
-xfce_panel_plugin_get_size(mwp-plugin), mwp);
-
-gtk_container_remove(GTK_CONTAINER(w),
- gtk_bin_get_child(GTK_BIN(w)));
-
-vbox = gtk_vbox_new(FALSE, BORDER/2);
-gtk_widget_show(vbox);
-gtk_container_add(GTK_CONTAINER(w), vbox);
-
-img = gtk_image_new_from_pixbuf(mwp-pix_newmail);
-gtk_widget_show(img);
-gtk_box_pack_start(GTK_BOX(vbox), img, TRUE, TRUE, 0);
-
-lbl = gtk_label_new_with_mnemonic(_(Ne_w mail));
-gtk_widget_show(lbl);
-gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 
0);
-}
-break;
+case ICON_TYPE_NORMAL:
+icon_path = (mwp-normal_icon);
+icon_pix = (mwp-pix_normal);
+label = gtk_label_new_with_mnemonic(_(_Normal));
+break;
+case ICON_TYPE_NEW_MAIL:
+icon_path = (mwp-new_mail_icon);
+icon_pix = (mwp-pix_newmail);
+label = gtk_label_new_with_mnemonic(_(Ne_w mail));
+break;
 }
+
+g_free(*icon_path);
+*icon_path = filename;
+mailwatch_set_size(mwp-plugin, 
+   xfce_panel_plugin_get_size(mwp-plugin), mwp);
+
+gtk_container_remove(GTK_CONTAINER(w), 
gtk_bin_get_child(GTK_BIN(w)));
+
+vbox = gtk_vbox_new(FALSE, BORDER / 2

[Xfce4-commits] xfce4-mailwatch-plugin:master Use identifiers instead of magic numbers

[Ján Sučan]

Updating branch refs/heads/master
 to 7f30e1faac924e874ecac7a6b32c43ea9692cc00 (commit)
   from fc9c9f704b72c5741d3cce2a977b023b5e9a0449 (commit)

commit 7f30e1faac924e874ecac7a6b32c43ea9692cc00
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 1 10:22:25 2013 +0200

Use identifiers instead of magic numbers

 panel-plugin/mailwatch-plugin.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index b7920ae..f79b737 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -192,7 +192,7 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton 
*evt,
 }
 }
 
-if(evt-button == 2)
+if(evt-button == MOUSE_BUTTON_MIDDLE)
 gtk_button_released(GTK_BUTTON(w));
 
 return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Update to the new panel plugin model

[Ján Sučan]

Updating branch refs/heads/master
 to 1532580be875df056d077c7abd7a248eb20c75f3 (commit)
   from 7c655539383fd9180b79f282d2c5a2e7502059e8 (commit)

commit 1532580be875df056d077c7abd7a248eb20c75f3
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 1 12:51:55 2013 +0200

Update to the new panel plugin model

 panel-plugin/Makefile.am   |   55 +---
 panel-plugin/mailwatch-plugin.c|3 +-
 ...ailwatch.desktop.in.in = mailwatch.desktop.in} |3 +-
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index df2c2d8..d966700 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,10 +1,18 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-mailwatch-plugin
+#
+# Mailwatch plugin
+#
+plugindir = $(libdir)/xfce4/panel-plugins
+
+plugin_LTLIBRARIES = \
+   libmailwatch-plugin.la
 
-xfce4_mailwatch_plugin_SOURCES = \
+libmailwatch_plugin_la_SOURCES = \
mailwatch-plugin.c
 
-xfce4_mailwatch_plugin_CFLAGS = \
+libmailwatch_plugin_la_DEPENDENCIES = \
+   $(top_builddir)/libmailwatch-core/libmailwatch-core.la
+
+libmailwatch_plugin_la_CFLAGS = \
-I$(top_srcdir)/libmailwatch-core \
@GTHREAD_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@ \
@@ -12,10 +20,13 @@ xfce4_mailwatch_plugin_CFLAGS = \
-DDATADIR=\$(datadir)\ \
-DLOCALEDIR=\$(localedir)\
 
-xfce4_mailwatch_plugin_DEPENDENCIES = \
-   $(top_builddir)/libmailwatch-core/libmailwatch-core.la
+libmailwatch_plugin_la_LDFLAGS = \
+   -avoid-version \
+   -module \
+   -no-undefined \
+   -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
 
-xfce4_mailwatch_plugin_LDADD = \
+libmailwatch_plugin_la_LIBADD = \
$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
@GTHREAD_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
@@ -23,31 +34,15 @@ xfce4_mailwatch_plugin_LDADD = \
@GNUTLS_LIBS@ \
@LIBGCRYPT_LIBS@
 
-if HAVE_CYGWIN
-  xfce4_mailwatch_plugin_LDFLAGS = \
-   -no-undefined
-endif
-
-# .desktop file
 #
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a name.desktop.in.in file.
-# 
-desktop_in_in_files = mailwatch.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+# Desktop file
+#
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_DATA = mailwatch.desktop
 @INTLTOOL_DESKTOP_RULE@
 
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
-   sed -e s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^ \
-   $  $@
-
-EXTRA_DIST = $(desktop_in_in_files)
+EXTRA_DIST = \
+   mailwatch.desktop.in
 
 DISTCLEANFILES = \
-   $(desktop_DATA) $(desktop_in_files)
+   $(desktop_DATA)
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index f79b737..137b45e 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -1131,5 +1131,4 @@ mailwatch_construct(XfcePanelPlugin *plugin)
 xfce_mailwatch_force_update(mwp-mailwatch);
 }
 
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(mailwatch_construct);
-
+XFCE_PANEL_PLUGIN_REGISTER(mailwatch_construct);
diff --git a/panel-plugin/mailwatch.desktop.in.in 
b/panel-plugin/mailwatch.desktop.in
similarity index 71%
rename from panel-plugin/mailwatch.desktop.in.in
rename to panel-plugin/mailwatch.desktop.in
index 9e106b7..e92b5e5 100644
--- a/panel-plugin/mailwatch.desktop.in.in
+++ b/panel-plugin/mailwatch.desktop.in
@@ -4,4 +4,5 @@ Encoding=UTF-8
 _Name=Mail Watcher
 _Comment=Check mail from multiple mailboxes
 Icon=xfce-mail
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-mailwatch-plugin
+X-XFCE-Module=mailwatch-plugin
+X-XFCE-Internal=false
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix the list of translatable source files

[Ján Sučan]

Updating branch refs/heads/master
 to 71deaf65a4d0f9f2a076690dd817050e2099a2b6 (commit)
   from bdcb0b2e98a2e1682fcd60660c8245fdcc860326 (commit)

commit 71deaf65a4d0f9f2a076690dd817050e2099a2b6
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 1 22:28:43 2013 +0200

Fix the list of translatable source files

 po/POTFILES.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88576b7..4646561 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,4 +11,4 @@ libmailwatch-core/mailwatch.c
 panel-plugin/mailwatch-plugin.c
 
 # files added by intltool-prepare.
-panel-plugin/mailwatch.desktop.in.in
+panel-plugin/mailwatch.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Remove deprecated gnutls function

[Ján Sučan]

Updating branch refs/heads/master
 to bccd352d9f22217a8555a98e8c4147f7d53c3a72 (commit)
   from 71deaf65a4d0f9f2a076690dd817050e2099a2b6 (commit)

commit bccd352d9f22217a8555a98e8c4147f7d53c3a72
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 1 23:23:48 2013 +0200

Remove deprecated gnutls function

Remove the gnutls_certificate_type_set_priority() use since x509 is the
default certificate type anyway.

 libmailwatch-core/mailwatch-net-conn.c |5 -
 1 file changed, 5 deletions(-)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index 9e589a6..b7bbac2 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -600,10 +600,6 @@ gboolean
 xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn *net_conn,
 GError **error)
 {
-#ifdef HAVE_SSL_SUPPORT
-const int cert_type_prio[2] = { GNUTLS_CRT_X509, 0 };
-#endif
-
 g_return_val_if_fail(net_conn  (!error || !*error), FALSE);
 g_return_val_if_fail(net_conn-fd != -1, FALSE);
 g_return_val_if_fail(!net_conn-is_secure, TRUE);
@@ -618,7 +614,6 @@ xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn 
*net_conn,
 /* init the session and set it up */
 gnutls_init(net_conn-gt_session, GNUTLS_CLIENT);
 gnutls_set_default_priority(net_conn-gt_session);
-gnutls_certificate_type_set_priority(net_conn-gt_session, cert_type_prio);
 gnutls_credentials_set(net_conn-gt_session, GNUTLS_CRD_CERTIFICATE,
net_conn-gt_creds);
 gnutls_transport_set_ptr(net_conn-gt_session,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Remove set but unused variable

[Ján Sučan]

Updating branch refs/heads/master
 to 03a3a1db86abda8628c9ba63efe4df89026e39b8 (commit)
   from c16fa74fbd402bb756af6b6c36dbb8999d440e6d (commit)

commit 03a3a1db86abda8628c9ba63efe4df89026e39b8
Author: Ján Sučan su...@runbox.com
Date:   Sun Sep 1 23:45:15 2013 +0200

Remove set but unused variable

 panel-plugin/mailwatch-plugin.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 137b45e..38bb9a3 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -598,11 +598,10 @@ static void
 mailwatch_log_status_toggled_cb(GtkToggleButton *tb, gpointer user_data)
 {
 XfceMailwatchPlugin *mwp = user_data;
-gboolean have_new_msgs;
 
 mwp-show_log_status = gtk_toggle_button_get_active(tb);
 
-have_new_msgs = !!xfce_mailwatch_get_new_messages(mwp-mailwatch);
+xfce_mailwatch_get_new_messages(mwp-mailwatch);
 mailwatch_set_size(mwp-plugin,
xfce_panel_plugin_get_size(mwp-plugin),
mwp);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix recieving data from multiple packets

[Ján Sučan]

Updating branch refs/heads/master
 to 19be3432dc694143084e33630a11a7d2157373d8 (commit)
   from d271a1a6e341fdc2e94762a747c4120bacdfe81a (commit)

commit 19be3432dc694143084e33630a11a7d2157373d8
Author: Ján Sučan su...@runbox.com
Date:   Sat Aug 31 13:21:43 2013 +0200

Fix recieving data from multiple packets

Check if there are unread data in the gnutls buffers, first.

gnutls is buffering data from the last packet internally. Therefore,
there can be some received data, even if the socket file descriptor is
not readable.

Thanks to Bron Gondwana for tracing this bug.

 libmailwatch-core/mailwatch-net-conn.c |7 +++
 1 file changed, 7 insertions(+)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index 785eaf4..8d0d07d 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -760,6 +760,13 @@ xfce_mailwatch_net_conn_recv_internal(XfceMailwatchNetConn 
*net_conn,
 if(!block)
 tv.tv_sec = 0;
 
+#ifdef HAVE_SSL_SUPPORT
+/* Read data from the gnutls read buffer, first. */
+if (net_conn-is_secure
+ (ret = gnutls_record_check_pending(net_conn-gt_session))  0) {
+break;
+}
+#endif
 ret = select(FD_SETSIZE, rfd, NULL, NULL, tv);
 if(ret  0  FD_ISSET(net_conn-fd, rfd))
 break;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix format string of printf-like function

[Ján Sučan]

Updating branch refs/heads/master
 to a3059a222c798e31530d9abdea0075cd89449d4e (commit)
   from 19be3432dc694143084e33630a11a7d2157373d8 (commit)

commit a3059a222c798e31530d9abdea0075cd89449d4e
Author: Ján Sučan su...@runbox.com
Date:   Sat Aug 31 17:36:41 2013 +0200

Fix format string of printf-like function

 libmailwatch-core/mailwatch-net-conn.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index 8d0d07d..454f6ed 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -225,7 +225,7 @@ xfce_mailwatch_net_conn_tls_handshake(XfceMailwatchNetConn 
*net_conn,
 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;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix gettext translatable string

[Ján Sučan]

Updating branch refs/heads/master
 to fc9c9f704b72c5741d3cce2a977b023b5e9a0449 (commit)
   from a3059a222c798e31530d9abdea0075cd89449d4e (commit)

commit fc9c9f704b72c5741d3cce2a977b023b5e9a0449
Author: Ján Sučan su...@runbox.com
Date:   Sat Aug 31 19:25:18 2013 +0200

Fix gettext translatable string

gettext does not support macros for type specifiers other than ISO C99
inttypes.

Divide string construction into the type specifier dependent code and
the type specifier independent code.

 libmailwatch-core/mailwatch-net-conn.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index 454f6ed..9e589a6 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -965,9 +965,11 @@ xfce_mailwatch_net_conn_recv_line(XfceMailwatchNetConn 
*net_conn,
 
 if((gint)buf_len  p - (gchar *)net_conn-buffer) {
 if(error) {
+gchar *bl = g_strdup_printf(% G_GSIZE_FORMAT, buf_len);
 g_set_error(error, XFCE_MAILWATCH_ERROR, 0,
-_(Buffer is not large enough to hold a full line (% 
G_GSIZE_FORMAT   %d)),
-buf_len, (gint)(p - (gchar *)net_conn-buffer));
+_(Buffer is not large enough to hold a full line (%s 
 %d)),
+bl, (gint)(p - (gchar *)net_conn-buffer));
+g_free(bl);
 }
 return -1;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Port to libxfce4ui

[Ján Sučan]

Updating branch refs/heads/master
 to 5c2ae425668949686670f6b695ee20dadb588f49 (commit)
   from 47da4a9a330c646a6b62eed28f11726785902ae0 (commit)

commit 5c2ae425668949686670f6b695ee20dadb588f49
Author: Ján Sučan su...@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

[Xfce4-commits] xfce4-mailwatch-plugin:master Delete unnecessary #if/#else/#endif code

[Ján Sučan]

Updating branch refs/heads/master
 to 4b2e4b73cc33f8f4a9010556f6e4ac67094723d9 (commit)
   from 5c2ae425668949686670f6b695ee20dadb588f49 (commit)

commit 4b2e4b73cc33f8f4a9010556f6e4ac67094723d9
Author: Ján Sučan su...@runbox.com
Date:   Fri Aug 30 11:45:07 2013 +0200

Delete unnecessary #if/#else/#endif code

Gtk = 2.18.0 is required to compile the sources. This makes these
statements needless because the same block is compiled every time.

 libmailwatch-core/mailwatch-mailbox-imap.c |   27 +--
 libmailwatch-core/mailwatch.c  |4 
 panel-plugin/mailwatch-plugin.c|   21 -
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/libmailwatch-core/mailwatch-mailbox-imap.c 
b/libmailwatch-core/mailwatch-mailbox-imap.c
index 8ffce3d..91ca4c7 100644
--- a/libmailwatch-core/mailwatch-mailbox-imap.c
+++ b/libmailwatch-core/mailwatch-mailbox-imap.c
@@ -1444,36 +1444,11 @@ imap_config_newmailfolders_btn_clicked_cb(GtkWidget *w, 
gpointer user_data)
 
 render = gtk_cell_renderer_pixbuf_new();
 gtk_tree_view_column_pack_start(col, render, FALSE);
-#if GTK_CHECK_VERSION(2, 6, 0)
 g_object_set(G_OBJECT(render),
  stock-id, GTK_STOCK_DIRECTORY,
  stock-size, GTK_ICON_SIZE_MENU,
  NULL);
-#else
-{
-gint iw, ih;
-GdkPixbuf *pix;
-GList *icons = NULL;
-GdkScreen *gscreen = gtk_widget_get_screen(treeview);
-XfceIconTheme *itheme = xfce_icon_theme_get_for_screen(gscreen);
-
-icons = g_list_prepend(icons, stock_open);
-icons = g_list_prepend(icons, stock_folder);
-icons = g_list_prepend(icons, stock_directory);
-icons = g_list_prepend(icons, gnome-fs-directory);
-icons = g_list_prepend(icons, folder);
-
-gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, iw, ih);
-pix = xfce_icon_theme_load_list(itheme, icons, iw);
-if(pix) {
-g_object_set(G_OBJECT(render), pixbuf, pix, NULL);
-g_object_unref(G_OBJECT(pix));
-}
-
-g_list_free(icons);
-}
-#endif
-
+
 imailbox-render = render = gtk_cell_renderer_text_new();
 gtk_tree_view_column_pack_start(col, render, TRUE);
 gtk_tree_view_column_set_attributes(col, render,
diff --git a/libmailwatch-core/mailwatch.c b/libmailwatch-core/mailwatch.c
index 76a35f9..1a51400 100644
--- a/libmailwatch-core/mailwatch.c
+++ b/libmailwatch-core/mailwatch.c
@@ -49,10 +49,6 @@
 
 #define BORDER  8
 
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#define GTK_STOCK_EDIT GTK_STOCK_PROPERTIES
-#endif
-
 typedef struct
 {
 XfceMailwatchMailbox *mailbox;
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index e69a937..ff6c52b 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -56,10 +56,6 @@ typedef struct
 GdkPixbuf *pix_normal;
 GdkPixbuf *pix_newmail;
 
-#if !GTK_CHECK_VERSION(2, 12, 0)
-GtkTooltips *tooltip;
-#endif
-
 gchar *click_command;
 gchar *new_messages_command;
 
@@ -107,12 +103,8 @@ mailwatch_new_messages_changed_cb(XfceMailwatch 
*mailwatch, gpointer arg,
 mailwatch_set_size(mwp-plugin,
xfce_panel_plugin_get_size(mwp-plugin),
mwp);
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text(mwp-button, _(No new mail));
 gtk_widget_trigger_tooltip_query(mwp-button);
-#else
-gtk_tooltips_set_tip(mwp-tooltip, mwp-button, _(No new mail), 
NULL);
-#endif
 } else if(new_messages  0) {
 if(!mwp-newmail_icon_visible) {
 mwp-newmail_icon_visible = TRUE;
@@ -147,12 +139,8 @@ mailwatch_new_messages_changed_cb(XfceMailwatch 
*mailwatch, gpointer arg,
 g_strfreev(mailbox_names);
 g_free(new_message_counts);
 
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text(mwp-button, ttip_str-str);
 gtk_widget_trigger_tooltip_query(mwp-button);
-#else
-gtk_tooltips_set_tip(mwp-tooltip, mwp-button, ttip_str-str, 
NULL);
-#endif
 g_string_free(ttip_str, TRUE);
 
 if(mwp-new_messages_command)
@@ -430,12 +418,7 @@ mailwatch_create(XfcePanelPlugin *plugin)
 g_signal_connect(mwp-button, button-release-event,
 G_CALLBACK(mailwatch_button_release_cb), mwp);
 
-#if GTK_CHECK_VERSION(2, 12, 0)
 gtk_widget_set_tooltip_text(mwp-button, _(No new mail));
-#else
-mwp-tooltip = gtk_tooltips_new();
-gtk_tooltips_set_tip(mwp-tooltip, mwp-button, _(No new mail), NULL);
-#endif
 
 xfce_panel_plugin_add_action_widget(plugin, mwp-button);
 
@@ -1028,10 +1011,6 @@ mailwatch_free(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 
 g_object_unref(G_OBJECT(mwp-loglist));
 
-#if !GTK_CHECK_VERSION(2, 12, 0

[Xfce4-commits] xfce4-mailwatch-plugin:master Use identifiers instead of magic numbers

[Ján Sučan]

Updating branch refs/heads/master
 to 2bc3ecf116fb5bfa7709fca27e5704b341f6f5af (commit)
   from 4b2e4b73cc33f8f4a9010556f6e4ac67094723d9 (commit)

commit 2bc3ecf116fb5bfa7709fca27e5704b341f6f5af
Author: Ján Sučan su...@runbox.com
Date:   Fri Aug 30 13:11:45 2013 +0200

Use identifiers instead of magic numbers

 panel-plugin/mailwatch-plugin.c |   25 +
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index ff6c52b..3497ff9 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -39,9 +39,10 @@
 
 #define BORDER 8
 #define DEFAULT_LOG_LINES500
-#define XFCE_MAILWATCH_RESPONSE_CLEAR  72347
 #define DEFAULT_NORMAL_ICONxfce-nomail
 #define DEFAULT_NEW_MAIL_ICON  xfce-newmail
+#define MOUSE_BUTTON_LEFT  1
+#define MOUSE_BUTTON_MIDDLE2
 
 typedef struct
 {
@@ -73,6 +74,12 @@ typedef struct
 } XfceMailwatchPlugin;
 
 enum {
+ICON_TYPE_NORMAL,
+ICON_TYPE_NEW_MAIL,
+XFCE_MAILWATCH_RESPONSE_CLEAR
+};
+
+enum {
 LOGLIST_COLUMN_PIXBUF = 0,
 LOGLIST_COLUMN_TIME,
 LOGLIST_COLUMN_MESSAGE,
@@ -174,14 +181,14 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton 
*evt,
 evt-y  w-allocation.y + w-allocation.height)
 {
 switch(evt-button) {
-case 1:  /* left */
+case MOUSE_BUTTON_LEFT:
 if(mwp-click_command  *mwp-click_command)
 xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
   mwp-click_command,
   FALSE, FALSE, NULL);
 break;
 
-case 2:  /* middle */
+case MOUSE_BUTTON_MIDDLE:
 xfce_mailwatch_force_update(mwp-mailwatch);
 break;
 }
@@ -734,7 +741,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
mailwatch-icontype));
 GtkWidget *chooser, *toplevel;
 
-g_return_if_fail(icon_type == 1 || icon_type == 2);
+g_return_if_fail(icon_type == ICON_TYPE_NORMAL || icon_type == 
ICON_TYPE_NEW_MAIL);
 
 toplevel = gtk_widget_get_toplevel(w);
 chooser = gtk_file_chooser_dialog_new(_(Select Icon),
@@ -748,7 +755,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
 gchar *filename = 
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
 if(filename) {
 switch(icon_type) {
-case 1:
+case ICON_TYPE_NORMAL:
 {
 GtkWidget *vbox, *img, *lbl;
 
@@ -774,7 +781,7 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w, 
XfceMailwatchPlugin *mwp)
 }
 break;
 
-case 2:
+case ICON_TYPE_NEW_MAIL:
 {
 GtkWidget *vbox, *img, *lbl;
 
@@ -936,7 +943,8 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 gtk_container_add(GTK_CONTAINER(frame_bin), hbox);
 
 btn = gtk_button_new();
-g_object_set_data(G_OBJECT(btn), mailwatch-icontype, GINT_TO_POINTER(1));
+g_object_set_data(G_OBJECT(btn), mailwatch-icontype,
+  GINT_TO_POINTER(ICON_TYPE_NORMAL));
 gtk_widget_show(btn);
 gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0);
 g_signal_connect(G_OBJECT(btn), clicked,
@@ -956,7 +964,8 @@ mailwatch_create_options(XfcePanelPlugin *plugin, 
XfceMailwatchPlugin *mwp)
 gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 0);
 
 btn = gtk_button_new();
-g_object_set_data(G_OBJECT(btn), mailwatch-icontype, GINT_TO_POINTER(2));
+g_object_set_data(G_OBJECT(btn), mailwatch-icontype,
+  GINT_TO_POINTER(ICON_TYPE_NEW_MAIL));
 gtk_widget_show(btn);
 gtk_box_pack_start(GTK_BOX(hbox), btn, FALSE, FALSE, 0);
 g_signal_connect(G_OBJECT(btn), clicked,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Delete unused variables and code

[Ján Sučan]

Updating branch refs/heads/master
 to 6602a2e8c4e5e12cf719832c40b2c2dcd635ff7e (commit)
   from 2bc3ecf116fb5bfa7709fca27e5704b341f6f5af (commit)

commit 6602a2e8c4e5e12cf719832c40b2c2dcd635ff7e
Author: Ján Sučan su...@runbox.com
Date:   Fri Aug 30 14:04:23 2013 +0200

Delete unused variables and code

 panel-plugin/mailwatch-plugin.c |6 --
 1 file changed, 6 deletions(-)

diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 3497ff9..b7920ae 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -69,8 +69,6 @@ typedef struct
 GdkPixbuf   *pix_log[XFCE_MAILWATCH_N_LOG_LEVELS];
 XfceMailwatchLogLevel   log_status;
 GtkListStore*loglist;
-
-GtkWidget *about_dialog;
 } XfceMailwatchPlugin;
 
 enum {
@@ -999,9 +997,6 @@ mailwatch_free(XfcePanelPlugin *plugin, XfceMailwatchPlugin 
*mwp)
 #ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
 xfce_posix_signal_handler_restore_handler(SIGUSR2);
 #endif
-
-if(mwp-about_dialog)
-gtk_widget_destroy(mwp-about_dialog);
 
 xfce_mailwatch_destroy(mwp-mailwatch);
 
@@ -1035,7 +1030,6 @@ static void
 mailwatch_show_about(XfcePanelPlugin *plugin,
  gpointer user_data)
 {
-XfceMailwatchPlugin *mwp = user_data;
 GdkPixbuf *icon;
 
 const gchar *auth[] = { Brian J. Tarricone bj...@cornell.edu Maintainer, 
Original Author,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix Yoda Conditions

[Ján Sučan]

Updating branch refs/heads/master
 to d271a1a6e341fdc2e94762a747c4120bacdfe81a (commit)
   from 6602a2e8c4e5e12cf719832c40b2c2dcd635ff7e (commit)

commit d271a1a6e341fdc2e94762a747c4120bacdfe81a
Author: Ján Sučan su...@runbox.com
Date:   Sat Aug 31 00:02:26 2013 +0200

Fix Yoda Conditions

 libmailwatch-core/mailwatch-net-conn.c |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index dc3786b..785eaf4 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -210,7 +210,7 @@ xfce_mailwatch_net_conn_tls_handshake(XfceMailwatchNetConn 
*net_conn,
 TIMER_START;
 do {
 ret = gnutls_handshake(net_conn-gt_session);
-} while((GNUTLS_E_AGAIN == ret || GNUTLS_E_INTERRUPTED == ret)
+} while((ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
  !TIMER_EXPIRED(RECV_TIMEOUT)  SHOULD_CONTINUE(net_conn));
 
 if(ret != GNUTLS_E_SUCCESS) {
@@ -220,7 +220,7 @@ xfce_mailwatch_net_conn_tls_handshake(XfceMailwatchNetConn 
*net_conn,
 if(!SHOULD_CONTINUE(net_conn)) {
 code = XFCE_MAILWATCH_ERROR_ABORTED;
 reason = _(Operation aborted);
-} else if(GNUTLS_E_AGAIN == ret || GNUTLS_E_INTERRUPTED == ret)
+} else if(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
 reason = strerror(ETIMEDOUT);
 else
 reason = gnutls_strerror(ret);
@@ -249,10 +249,10 @@ xfce_mailwatch_net_conn_do_connect(XfceMailwatchNetConn 
*net_conn,
 TIMER_START;
 do {
 ret = connect(net_conn-fd, addr, addrlen);
-} while(ret  0  (EINTR == errno || EAGAIN == errno)
+} while(ret  0  (errno == EINTR || errno == EAGAIN)
  !TIMER_EXPIRED(RECV_TIMEOUT)  SHOULD_CONTINUE(net_conn));
 
-if(!ret || (ret  0  EINPROGRESS == errno))  /* we're done here */
+if(!ret || (ret  0  errno == EINPROGRESS))  /* we're done here */
 return XFCE_MAILWATCH_NET_CONN_SUCCESS;
 
 /* this is a little different.  the only 'fatal' error at this
@@ -294,7 +294,7 @@ 
xfce_mailwatch_net_conn_get_connect_status(XfceMailwatchNetConn *net_conn,
 
 /* wait until the connect attempt finishes */
 if(select(FD_SETSIZE, NULL, wfd, NULL, tv)  0) {
-if(EINTR == errno)
+if(errno == EINTR)
 continue;
 /* FIXME: should a select() failure actually be fatal? */
 return XFCE_MAILWATCH_NET_CONN_ERROR;
@@ -497,7 +497,7 @@ xfce_mailwatch_net_conn_get_addrinfo(XfceMailwatchNetConn 
*net_conn,
 g_set_error(error, XFCE_MAILWATCH_ERROR, 0,
 _(Could not find host \%s\: %s),
 net_conn-hostname,
-EAI_SYSTEM == ret ? strerror(errno)
+ret == EAI_SYSTEM ? strerror(errno)
   : gai_strerror(ret));
 }
 return FALSE;
@@ -679,12 +679,12 @@ xfce_mailwatch_net_conn_send_data(XfceMailwatchNetConn 
*net_conn,
  buf + totallen - bytesleft,
  bytesleft);
 
-if(GNUTLS_E_REHANDSHAKE == ret) {
+if(ret == GNUTLS_E_REHANDSHAKE) {
 if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error))
 return -1;
 ret = GNUTLS_E_AGAIN;
 }
-} while((GNUTLS_E_INTERRUPTED == ret || GNUTLS_E_AGAIN == ret)
+} while((ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN)
  !TIMER_EXPIRED(RECV_TIMEOUT)  
SHOULD_CONTINUE(net_conn));
 
 if(ret  0) {
@@ -716,7 +716,7 @@ xfce_mailwatch_net_conn_send_data(XfceMailwatchNetConn 
*net_conn,
 TIMER_START;
 do {
 bout = send(net_conn-fd, buf, buf_len, MSG_NOSIGNAL);
-} while(bout  0  (EINTR == errno || EAGAIN == errno)
+} while(bout  0  (errno == EINTR || errno == EAGAIN)
  !TIMER_EXPIRED(RECV_TIMEOUT)  SHOULD_CONTINUE(net_conn));
 }
 
@@ -727,7 +727,7 @@ xfce_mailwatch_net_conn_send_data(XfceMailwatchNetConn 
*net_conn,
 if(!SHOULD_CONTINUE(net_conn)) {
 code = XFCE_MAILWATCH_ERROR_ABORTED;
 reason = _(Operation aborted);
-} else if(EINTR == errno || EAGAIN == errno)
+} else if(errno == EINTR || errno == EAGAIN)
 reason = strerror(ETIMEDOUT);
 else
 reason = strerror(errno);
@@ -763,16 +763,16 @@ 
xfce_mailwatch_net_conn_recv_internal(XfceMailwatchNetConn *net_conn,
 ret = select(FD_SETSIZE, rfd, NULL, NULL, tv);
 if(ret  0  FD_ISSET(net_conn-fd, rfd))
 break;
-else if(ret  0  EINTR != errno) {
+else if(ret  0  errno != EINTR) {
 g_set_error(error, XFCE_MAILWATCH_ERROR

[Xfce4-commits] xfce4-mailwatch-plugin:master Disable static libs by default at libtool init

[Ján Sučan]

Updating branch refs/heads/master
 to 47da4a9a330c646a6b62eed28f11726785902ae0 (commit)
   from 686c45a77597337119cd9f7cbc4fccdd9c8739ba (commit)

commit 47da4a9a330c646a6b62eed28f11726785902ae0
Author: Ján Sučan su...@runbox.com
Date:   Fri Aug 30 00:29:18 2013 +0200

Disable static libs by default at libtool init

Fix half of bug 6920.

 configure.ac.in |1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac.in b/configure.ac.in
index 09ddb47..dab6bc9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -33,6 +33,7 @@ AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_INTLTOOL([0.31], [no-xml])
 LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
 dnl check for standard header files
 AC_HEADER_STDC
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Use libtool of version 2.2.6 or later

[Ján Sučan]

Updating branch refs/heads/master
 to 686c45a77597337119cd9f7cbc4fccdd9c8739ba (commit)
   from 0b2e4f3d0d3c34e120e3a1b7b9c994dec116557c (commit)

commit 686c45a77597337119cd9f7cbc4fccdd9c8739ba
Author: Ján Sučan su...@runbox.com
Date:   Fri Aug 30 00:28:18 2013 +0200

Use libtool of version 2.2.6 or later

Fix half of bug 6920.

 configure.ac.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 28101a1..09ddb47 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -31,8 +31,8 @@ dnl check for basic programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 AC_PROG_INTLTOOL([0.31], [no-xml])
+LT_PREREQ([2.2.6])
 
 dnl check for standard header files
 AC_HEADER_STDC
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix the list of translatable source files

[Ján Sučan]

Updating branch refs/heads/master
 to 3dccdc161471076e27989948f4c182076c85 (commit)
   from ea3109ef1e1ed9736cd8d441d6474ef6c82bec1e (commit)

commit 3dccdc161471076e27989948f4c182076c85
Author: Ján Sučan su...@runbox.com
Date:   Tue Aug 27 12:18:56 2013 +0200

Fix the list of translatable source files

Delete a path of the old 4.2 panel plugin source file from the list of
source files containing translatable strings.

 po/POTFILES.in |1 -
 1 file changed, 1 deletion(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index f6757d9..88576b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ libmailwatch-core/mailwatch-mailbox-mh.c
 libmailwatch-core/mailwatch-mailbox-pop3.c
 libmailwatch-core/mailwatch-net-conn.c
 libmailwatch-core/mailwatch.c
-panel-plugin/mailwatch-plugin-4.2.c
 panel-plugin/mailwatch-plugin.c
 
 # files added by intltool-prepare.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Move version information format from SVN to Git

[Ján Sučan]

Updating branch refs/heads/master
 to 0b2e4f3d0d3c34e120e3a1b7b9c994dec116557c (commit)
   from 3dccdc161471076e27989948f4c182076c85 (commit)

commit 0b2e4f3d0d3c34e120e3a1b7b9c994dec116557c
Author: Ján Sučan su...@runbox.com
Date:   Tue Aug 27 17:52:11 2013 +0200

Move version information format from SVN to Git

 configure.ac.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index f2946f1..28101a1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,9 +7,9 @@ dnl version info
 m4_define([mailwatch_version_major], [1])
 m4_define([mailwatch_version_minor], [1])
 m4_define([mailwatch_version_micro], [0])
-m4_define([mailwatch_version_build], [r@REVISION@])
-m4_define([mailwatch_version_tag], [svn])
-m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [svn], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
+m4_define([mailwatch_version_build], [@REVISION@])
+m4_define([mailwatch_version_tag], [git])
+m4_define([mailwatch_version], 
[mailwatch_version_major().mailwatch_version_minor().mailwatch_version_micro()ifelse(mailwatch_version_tag(),
 [git], [mailwatch_version_tag()-mailwatch_version_build()], 
[mailwatch_version_tag()])])
 
 dnl init autoconf
 AC_INIT([xfce4-mailwatch-plugin], [mailwatch_version],
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix compilation error when using gnutls = 3.0.3

[Ján Sučan]

Updating branch refs/heads/master
 to 5c19dd14a41032594c00fd222de705c76a79c0ec (commit)
   from e19717d627b4750188381d22281ad0f8b5b3bc12 (commit)

commit 5c19dd14a41032594c00fd222de705c76a79c0ec
Author: Ján Sučan su...@runbox.com
Date:   Mon Aug 26 12:20:25 2013 +0200

Fix compilation error when using gnutls = 3.0.3

The gnutls_transport_set_lowat() function is now compiled
conditionally according to the used version of gnutls.

This function has been deprecated since gnutls = 2.12.0 and it has
been removed since gnutls = 3.0.3.

 libmailwatch-core/mailwatch-net-conn.c |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libmailwatch-core/mailwatch-net-conn.c 
b/libmailwatch-core/mailwatch-net-conn.c
index d3662e8..dc3786b 100644
--- a/libmailwatch-core/mailwatch-net-conn.c
+++ b/libmailwatch-core/mailwatch-net-conn.c
@@ -623,9 +623,11 @@ xfce_mailwatch_net_conn_make_secure(XfceMailwatchNetConn 
*net_conn,
net_conn-gt_creds);
 gnutls_transport_set_ptr(net_conn-gt_session,
  (gnutls_transport_ptr_t)net_conn-fd);
+#if GNUTLS_VERSION_NUMBER  0x020c00 
 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
 gnutls_bye(net_conn-gt_session, GNUTLS_SHUT_RDWR);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Drop the old panel support

[Ján Sučan]

Updating branch refs/heads/master
 to 73836bb5e619762d856725a975493ea9cd191c26 (commit)
   from 5c19dd14a41032594c00fd222de705c76a79c0ec (commit)

commit 73836bb5e619762d856725a975493ea9cd191c26
Author: Ján Sučan su...@runbox.com
Date:   Mon Aug 26 21:51:42 2013 +0200

Drop the old panel support

Version of the xfce4-mailwatch-plugin for the old 4.2 panel has been
considered unused, and thus support for it has been removed.

 configure.ac.in |   10 +-
 panel-plugin/Makefile.am|   46 +-
 panel-plugin/mailwatch-plugin-4.2.c |  898 ---
 3 files changed, 2 insertions(+), 952 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index b905f6e..22f2a7f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -56,15 +56,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([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20],
-  [have_44_panel=yes], [
-echo *** Package libxfce4panel not found.  Looking for old-style 4.2 panel
-])
-if test x$have_44_panel != xyes; then
-XDT_XFCE_PANEL_PLUGIN([XFCE4_PANEL], [4.2.0])
-fi
-AM_CONDITIONAL([BUILD_42_PANEL_PLUGIN], [test x$have_44_panel != xyes])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
 
 dnl see if we have a new enough libxfce4util for the posix signal handler stuff
 saved_CFLAGS=$CFLAGS
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index a7f36d5..10963f9 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,45 +1,3 @@
-# make sure both are distributed, regardless of which condition is taken
-EXTRA_DIST = \
-   mailwatch-plugin.c \
-   mailwatch-plugin-4.2.c
-
-if BUILD_42_PANEL_PLUGIN
-
-plugindir = @XFCE4_PANEL_PLUGINSDIR@
-plugin_LTLIBRARIES = libmailwatch.la
-
-libmailwatch_la_LDFLAGS = \
-   -avoid-version \
-   -export-dynamic \
-   -module
-
-if HAVE_CYGWIN
-  libmailwatch_la_LDFLAGS += \
-   -no-undefined \
-   -export-symbols $(datadir)/xfce4/devel/panel.def
-endif
-
-libmailwatch_la_SOURCES = \
-   mailwatch-plugin-4.2.c
-
-libmailwatch_la_CFLAGS = \
-   -I$(top_srcdir)/libmailwatch-core \
-   @GTHREAD_CFLAGS@ \
-   @XFCE4_PANEL_CFLAGS@ \
-   -DDATADIR=\$(datadir)\ \
-   -DLOCALEDIR=\$(localedir)\
-
-libmailwatch_la_DEPENDENCIES = \
-   $(top_builddir)/libmailwatch-core/libmailwatch-code.la
-
-libmailwatch_la_LIBADD = \
-   $(top_builddir)/libmailwatch-core/libmailwatch-core.la \
-   @GTHREAD_LIBS@ \
-   @XFCE4_PANEL_LIBS@ \
-   @GNUTLS_LIBS@
-
-else
-
 plugindir = $(libexecdir)/xfce4/panel-plugins
 plugin_PROGRAMS = xfce4-mailwatch-plugin
 
@@ -88,9 +46,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
sed -e s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^ \
$  $@
 
-EXTRA_DIST += $(desktop_in_in_files)
+EXTRA_DIST = $(desktop_in_in_files)
 
 DISTCLEANFILES = \
$(desktop_DATA) $(desktop_in_files)
-
-endif
diff --git a/panel-plugin/mailwatch-plugin-4.2.c 
b/panel-plugin/mailwatch-plugin-4.2.c
deleted file mode 100644
index 0adf652..000
--- a/panel-plugin/mailwatch-plugin-4.2.c
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- *  xfce4-mailwatch-plugin - a mail notification applet for the xfce4 panel
- *  Copyright (c) 2005 Brian Tarricone bj...@cornell.edu
- *
- *  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 ONLY.
- *
- *  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 Library 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 config.h
-#endif
-
-#include gtk/gtk.h
-
-#include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
-#include libxfcegui4/xfce_scaled_image.h
-
-#include panel/plugins.h
-#include panel/xfce.h
-
-#include mailwatch.h
-#include mailwatch-mailbox.h
-#include mailwatch-utils.h
-
-#define BORDER 8
-#define DEFAULT_LOG_LINES500
-#define XFCE_MAILWATCH_RESPONSE_CLEAR  72347
-#define DEFAULT_NORMAL_ICONxfce-nomail
-#define DEFAULT_NEW_MAIL_ICON  xfce-newmail
-
-static void mailwatch_set_size(Control *c, gint size);
-
-typedef struct
-{
-XfceMailwatch *mailwatch;
-
-GtkWidget *button;
-GtkWidget *image

[Xfce4-commits] xfce4-mailwatch-plugin:master Delete spare tab characters on blank lines

[Ján Sučan]

Updating branch refs/heads/master
 to aaac9b08a5fa8a67876f24a6e017422a72b5db5f (commit)
   from 73836bb5e619762d856725a975493ea9cd191c26 (commit)

commit aaac9b08a5fa8a67876f24a6e017422a72b5db5f
Author: Ján Sučan su...@runbox.com
Date:   Mon Aug 26 23:41:56 2013 +0200

Delete spare tab characters on blank lines

 panel-plugin/Makefile.am |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 10963f9..e62ac8d 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -36,11 +36,11 @@ endif
 # 
 desktop_in_in_files = mailwatch.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-   
+
 desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
-   
+
 # get full path into .desktop file
 %.desktop.in: %.desktop.in.in
sed -e s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^ \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-mailwatch-plugin:master Fix compilation and linking with libgcrypt

[Ján Sučan]

Updating branch refs/heads/master
 to ea3109ef1e1ed9736cd8d441d6474ef6c82bec1e (commit)
   from aaac9b08a5fa8a67876f24a6e017422a72b5db5f (commit)

commit ea3109ef1e1ed9736cd8d441d6474ef6c82bec1e
Author: Ján Sučan su...@runbox.com
Date:   Tue Aug 27 01:08:00 2013 +0200

Fix compilation and linking with libgcrypt

Presence of gnutls does not imply the presence of
libgcrypt. Therefore, enable SSL support only if both are present.

 configure.ac.in   |   13 +
 libmailwatch-core/Makefile.am |1 +
 panel-plugin/Makefile.am  |3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 22f2a7f..f2946f1 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -67,13 +67,18 @@ AC_CHECK_FUNCS([xfce_posix_signal_handler_init])
 CFLAGS=$saved_CFLAGS
 LIBS=$saved_LIBS
 
-dnl check for gnutls support
+dnl check for gnutls and libgcrypt support
 XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
-   [gnutls support for secure IMAP/POP3 connections], [yes])
+[gnutls and libgcrypt support for secure IMAP/POP3 connections], [yes])
 if test x$GNUTLS_FOUND = xyes; then
-   AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
+dnl libgcrypt does not provide a pkg-config file
+AM_PATH_LIBGCRYPT([1.2.0], LIBGCRYPT_FOUND=yes, LIBGCRYPT_FOUND=no)
+if test x$LIBGCRYPT_FOUND = xyes; then
+AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
+fi
 fi
-AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test x$GNUTLS_FOUND = xyes])
+AM_CONDITIONAL([HAVE_SSL_SUPPORT],
+   [test x$GNUTLS_FOUND = xyes -a x$LIBGCRYPT_FOUND = 
xyes])
 
 dnl to ipv6, or to not ipv6
 AC_MSG_CHECKING([whether to support IPv6])
diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am
index 181992e..59cfb19 100644
--- a/libmailwatch-core/Makefile.am
+++ b/libmailwatch-core/Makefile.am
@@ -29,5 +29,6 @@ libmailwatch_core_la_CFLAGS = \
@GTK_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@GNUTLS_CFLAGS@ \
+   @LIBGCRYPT_CFLAGS@ \
-DDATADIR=\$(datadir)\ \
-DLOCALEDIR=\$(localedir)\
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index e62ac8d..0d89440 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -20,7 +20,8 @@ xfce4_mailwatch_plugin_LDADD = \
@GTHREAD_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCEGUI4_LIBS@ \
-   @GNUTLS_LIBS@
+   @GNUTLS_LIBS@ \
+   @LIBGCRYPT_LIBS@
 
 if HAVE_CYGWIN
   xfce4_mailwatch_plugin_LDFLAGS = \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits