[Commits] fancy_viewer.c 1.1.2.1 1.1.2.2 fancy_viewer.h 1.1.2.1 1.1.2.2
colin at claws-mail.org
colin at claws-mail.org
Wed Feb 20 12:25:38 CET 2013
Update of /home/claws-mail/claws/src/plugins/fancy
In directory srv:/tmp/cvs-serv11307/src/plugins/fancy
Modified Files:
Tag: gtk2
fancy_viewer.c fancy_viewer.h
Log Message:
2013-02-20 [colin] 3.9.0cvs85
* configure.ac
Rework plugin enabling logic. More clean!
* src/plugins/fancy/fancy_viewer.c
* src/plugins/fancy/fancy_viewer.h
* src/plugins/spam_report/spam_report.c
Make curl dependancy mandatory
* src/plugins/notification/notification_plugin.c
Fix build with every possible thing disabled
* src/plugins/notification/Makefile.am
* src/plugins/notification/gtkhotkey/.cvsignore
* src/plugins/notification/gtkhotkey/Makefile.am
* src/plugins/notification/gtkhotkey/gtk-hotkey-error.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-error.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-info.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-info.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-listener.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-registry.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-utils.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-utils.h
* src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c
* src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.h
* src/plugins/notification/gtkhotkey/gtkhotkey.h
* src/plugins/notification/gtkhotkey/x11/eggaccelerators.c
* src/plugins/notification/gtkhotkey/x11/eggaccelerators.h
* src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
* src/plugins/notification/gtkhotkey/x11/tomboykeybinder.h
Re-add hotkey support
* src/plugins/spam_report/Makefile.am
* src/plugins/tnef_parse/Makefile.am
Remove gettext.h
Index: fancy_viewer.h
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/fancy/Attic/fancy_viewer.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- fancy_viewer.h 13 Feb 2013 16:38:37 -0000 1.1.2.1
+++ fancy_viewer.h 20 Feb 2013 11:25:35 -0000 1.1.2.2
@@ -53,11 +53,9 @@
#include <pthread.h>
#endif
-#ifdef HAVE_LIBCURL
#include <curl/curl.h>
#include <curl/curlver.h>
#include "filesel.h"
-#endif
#ifdef HAVE_LIBSOUP_GNOME
#include <libsoup/soup-gnome.h>
Index: fancy_viewer.c
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/fancy/Attic/fancy_viewer.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- fancy_viewer.c 13 Feb 2013 16:38:37 -0000 1.1.2.1
+++ fancy_viewer.c 20 Feb 2013 11:25:35 -0000 1.1.2.2
@@ -27,7 +27,7 @@
#include <fancy_prefs.h>
#include <alertpanel.h>
-#if USE_PRINTUNIX
+#if HAVE_GTKPRINTUNIX
#include <printing.h>
#if GTK_CHECK_VERSION(2,13,1)
#include <gtk/gtkunixprint.h>
@@ -78,12 +78,10 @@
static WebKitNavigationResponse fancy_open_uri (FancyViewer *viewer, gboolean external);
static void fancy_create_popup_prefs_menu(FancyViewer *viewer);
static void fancy_show_notice(FancyViewer *viewer, const gchar *message);
-#ifdef HAVE_LIBCURL
static size_t download_file_curl_write_cb(void *buffer, size_t size,
size_t nmemb, void *data);
static void *download_file_curl (void *data);
static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
-#endif
#if !WEBKIT_CHECK_VERSION (1,5,1)
gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
@@ -181,7 +179,7 @@
viewer->loading = TRUE;
g_timeout_add(5, (GtkFunction)fancy_show_mimepart_prepare, viewer);
}
-#if GTK_CHECK_VERSION(2,10,0) && USE_PRINTUNIX
+#if GTK_CHECK_VERSION(2,10,0) && HAVE_GTKPRINTUNIX
static void
job_complete_cb (GtkPrintJob *print_job, FancyViewer *viewer, GError *error)
@@ -737,7 +735,7 @@
debug_print("link: %s\n", viewer->cur_link);
open_uri(viewer->cur_link, prefs_common_get_uri_cmd());
}
-#ifdef HAVE_LIBCURL
+
static size_t download_file_curl_write_cb(void *buffer, size_t size,
size_t nmemb, void *data)
{
@@ -805,7 +803,7 @@
download_file_curl((void *)viewer);
#endif
}
-#endif
+
static void open_image_cb(GtkWidget *widget, FancyViewer *viewer)
{
debug_print("Not Yet Implemented\n");
@@ -871,7 +869,7 @@
"Download Linked File" )) {
gtk_label_set_text(GTK_LABEL(menul), _("Download Link"));
-#ifdef HAVE_LIBCURL
+
GtkImageMenuItem *m_dlink = GTK_IMAGE_MENU_ITEM(menuitem);
if (!fancy_prefs.block_extern_content) {
gtk_widget_set_sensitive(GTK_WIDGET(menul), TRUE);
@@ -887,17 +885,13 @@
g_signal_connect(G_OBJECT(m_dlink), "activate",
G_CALLBACK(download_file_cb),
(gpointer *) viewer);
-#else
- gtk_widget_set_sensitive(GTK_WIDGET(menul), FALSE);
-#endif
}
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
"Save Image As" )) {
gtk_label_set_text(GTK_LABEL(menul), _("Save Image As"));
-
-#ifdef HAVE_LIBCURL
+
GtkImageMenuItem *m_simage = GTK_IMAGE_MENU_ITEM(menuitem);
if (!fancy_prefs.block_extern_content) {
gtk_widget_set_sensitive(GTK_WIDGET(menul), TRUE);
@@ -912,9 +906,6 @@
}
g_signal_connect(G_OBJECT(m_simage), "activate",
G_CALLBACK(download_file_cb), (gpointer *) viewer);
-#else
- gtk_widget_set_sensitive(GTK_WIDGET(menul), FALSE);
-#endif
}
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
@@ -1013,7 +1004,7 @@
viewer->mimeviewer.get_widget = fancy_get_widget;
viewer->mimeviewer.get_selection = fancy_get_selection;
viewer->mimeviewer.show_mimepart = fancy_show_mimepart;
-#if GTK_CHECK_VERSION(2,10,0) && USE_PRINTUNIX
+#if GTK_CHECK_VERSION(2,10,0) && HAVE_GTKPRINTUNIX
viewer->mimeviewer.print = fancy_print;
#endif
viewer->mimeviewer.clear_viewer = fancy_clear_viewer;
More information about the Commits
mailing list