GNOME.org
 

balsa r7991 - in trunk: . libbalsa src

Author: PeterB
Date: Sun Nov 16 04:07:05 2008
New Revision: 7991
URL: http://svn.gnome.org/viewvc/balsa?rev=7991&view=rev

Log:
Use gtk_show_uri instead of gnome_help_display and gnome_url_show

Modified:
   trunk/ChangeLog
   trunk/libbalsa/body.h
   trunk/libbalsa/identity.c
   trunk/libbalsa/smtp-server.c
   trunk/src/address-book-config.c
   trunk/src/balsa-app.h
   trunk/src/balsa-index.h
   trunk/src/balsa-message.c
   trunk/src/balsa-message.h
   trunk/src/balsa-mime-widget-callbacks.c
   trunk/src/balsa-mime-widget-message.c
   trunk/src/balsa-mime-widget-text.c
   trunk/src/balsa-mime-widget.h
   trunk/src/filter-edit-callbacks.c
   trunk/src/filter-run-callbacks.c
   trunk/src/folder-conf.c
   trunk/src/main-window.c
   trunk/src/message-window.c
   trunk/src/pref-manager.c
   trunk/src/sendmsg-window.c
   trunk/src/spell-check.c
   trunk/src/spell-check.h
   trunk/src/toolbar-prefs.c

Modified: trunk/libbalsa/body.h
==============================================================================
--- trunk/libbalsa/body.h	(original)
+++ trunk/libbalsa/body.h	Sun Nov 16 04:07:05 2008
@@ -24,6 +24,7 @@
 #define __LIBBALSA_BODY_H__
 
 #include <stdio.h>
+#include <sys/stat.h>
 
 #include <glib.h>
 #include <gmime/gmime.h>

Modified: trunk/libbalsa/identity.c
==============================================================================
--- trunk/libbalsa/identity.c	(original)
+++ trunk/libbalsa/identity.c	Sun Nov 16 04:07:05 2008
@@ -21,10 +21,6 @@
 
 #include "config.h"
 
-#ifdef HAVE_GNOME
-#include <libgnome/gnome-help.h>
-#endif
-
 #ifdef HAVE_GPGME
 #  include "rfc3156.h"
 #endif
@@ -35,6 +31,12 @@
 #include <glib/gi18n.h>
 #include "misc.h"
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 #if ENABLE_ESMTP
 #include <string.h>
 #include "smtp-server.h"
@@ -1686,17 +1688,22 @@
 static void
 help_ident_cb(void)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err = NULL;
 
-#ifdef HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0)
+    gtk_show_uri(NULL, "ghelp:balsa?identities",
+                 gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
     gnome_help_display("balsa", "identities", &err);
-#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
     if (err) {
         g_print(_("Error displaying help for identities: %s\n"),
                 err->message);
         g_error_free(err);
     }
+#endif
 }
 
 /* libbalsa_identity_config_dialog displays an identity management

Modified: trunk/libbalsa/smtp-server.c
==============================================================================
--- trunk/libbalsa/smtp-server.c	(original)
+++ trunk/libbalsa/smtp-server.c	Sun Nov 16 04:07:05 2008
@@ -28,10 +28,6 @@
 #include <string.h>
 #include <libesmtp.h>
 
-#ifdef HAVE_GNOME
-#include <gnome.h>
-#endif                          /* HAVE_GNOME */
-
 #include "libbalsa.h"
 #include "server.h"
 #include "smtp-server.h"
@@ -39,6 +35,12 @@
 #include "misc.h"
 #include <glib/gi18n.h>
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 static LibBalsaServerClass *parent_class = NULL;
 
 struct _LibBalsaSmtpServer {
@@ -396,28 +398,31 @@
 }
 #endif                          /* HAVE_SMTP_TLS_CLIENT_CERTIFICATE */
 
-static const gchar smtp_server_section[] = "smtp-server-config";
-
 static void
 smtp_server_response(GtkDialog * dialog, gint response,
                      struct smtp_server_dialog_info *sdi)
 {
     LibBalsaServer *server = LIBBALSA_SERVER(sdi->smtp_server);
-#ifdef HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *error = NULL;
-#endif                          /* HAVE_GNOME */
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
     switch (response) {
     case GTK_RESPONSE_HELP:
-#ifdef HAVE_GNOME
-        gnome_help_display("balsa", smtp_server_section, &error);
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?smtp-server-config",
+                     gtk_get_current_event_time(), &error);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
+        gnome_help_display("balsa", "smtp-server-config", &error);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
         if (error) {
             libbalsa_information(LIBBALSA_INFORMATION_WARNING,
-                                 _("Error displaying %s: %s\n"),
-                                 smtp_server_section, error->message);
+                                 _("Error displaying server help: %s\n"),
+                                 error->message);
             g_error_free(error);
         }
-#endif                          /* HAVE_GNOME */
+#endif
         return;
     case GTK_RESPONSE_OK:
         libbalsa_smtp_server_set_name(sdi->smtp_server,

Modified: trunk/src/address-book-config.c
==============================================================================
--- trunk/src/address-book-config.c	(original)
+++ trunk/src/address-book-config.c	Sun Nov 16 04:07:05 2008
@@ -22,10 +22,12 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2, 6, 0)
-#undef GTK_DISABLE_DEPRECATED
+
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
 #include <gnome.h>
 #endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
 #include "balsa-app.h"
 #include "address-book-config.h"
@@ -535,9 +537,15 @@
 static void
 help_button_cb(AddressBookConfig * abc)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err = NULL;
 
+#if GTK_CHECK_VERSION(2, 14, 0)
+    gtk_show_uri(NULL, "ghelp:balsa?preferences-address-books",
+                 gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
     gnome_help_display("balsa", "preferences-1", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
     if (err) {
         libbalsa_information(LIBBALSA_INFORMATION_WARNING,
@@ -545,6 +553,7 @@
                              err->message);
         g_error_free(err);
     }
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 }
 
 

Modified: trunk/src/balsa-app.h
==============================================================================
--- trunk/src/balsa-app.h	(original)
+++ trunk/src/balsa-app.h	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 #ifndef __BALSA_APP_H__
 #define __BALSA_APP_H__
 
-#include <gnome.h>
 #include "libbalsa.h"
 #include "identity.h"
 #include "balsa-index.h"

Modified: trunk/src/balsa-index.h
==============================================================================
--- trunk/src/balsa-index.h	(original)
+++ trunk/src/balsa-index.h	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 #ifndef __BALSA_INDEX_H__
 #define __BALSA_INDEX_H__
 
-#include <gnome.h>
 #include "libbalsa.h"
 #include "filter.h"
 #include "mailbox-node.h"

Modified: trunk/src/balsa-message.c
==============================================================================
--- trunk/src/balsa-message.c	(original)
+++ trunk/src/balsa-message.c	Sun Nov 16 04:07:05 2008
@@ -42,6 +42,7 @@
 #include "balsa-mime-widget-image.h"
 #include "balsa-mime-widget-crypto.h"
 
+#include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "send.h"

Modified: trunk/src/balsa-message.h
==============================================================================
--- trunk/src/balsa-message.h	(original)
+++ trunk/src/balsa-message.h	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 #ifndef __BALSA_MESSAGE_H__
 #define __BALSA_MESSAGE_H__
 
-#include <gnome.h>
 #include "libbalsa.h"
 
 #ifdef __cplusplus

Modified: trunk/src/balsa-mime-widget-callbacks.c
==============================================================================
--- trunk/src/balsa-mime-widget-callbacks.c	(original)
+++ trunk/src/balsa-mime-widget-callbacks.c	Sun Nov 16 04:07:05 2008
@@ -30,6 +30,8 @@
 #include "balsa-mime-widget.h"
 #include "balsa-mime-widget-callbacks.h"
 
+#include <gnome.h> /* for gnome_execute_shell() */
+#include <gdk/gdkkeysyms.h>
 
 void
 balsa_mime_widget_ctx_menu_cb(GtkWidget * menu_item,

Modified: trunk/src/balsa-mime-widget-message.c
==============================================================================
--- trunk/src/balsa-mime-widget-message.c	(original)
+++ trunk/src/balsa-mime-widget-message.c	Sun Nov 16 04:07:05 2008
@@ -286,7 +286,7 @@
     GError *err = NULL;
 
     g_return_if_fail(url);
-    gnome_url_show(url, &err);
+    gtk_show_uri(NULL, url, gtk_get_current_event_time(), &err);
     if (err) {
 	balsa_information(LIBBALSA_INFORMATION_WARNING,
 			  _("Error showing %s: %s\n"), url, err->message);

Modified: trunk/src/balsa-mime-widget-text.c
==============================================================================
--- trunk/src/balsa-mime-widget-text.c	(original)
+++ trunk/src/balsa-mime-widget-text.c	Sun Nov 16 04:07:05 2008
@@ -929,7 +929,7 @@
         gtk_statusbar_push(statusbar, context_id, notice);
         SCHEDULE_BAR_REFRESH();
         g_free(notice);
-        gnome_url_show(url->url, &err);
+        gtk_show_uri(NULL, url->url, gtk_get_current_event_time(), &err);
         if (err) {
             balsa_information(LIBBALSA_INFORMATION_WARNING,
                     _("Error showing %s: %s\n"), url->url,
@@ -1214,7 +1214,7 @@
 {
     GError *err = NULL;
 
-    gnome_url_show(url, &err);
+    gtk_show_uri(NULL, url, gtk_get_current_event_time(), &err);
     if (err) {
         balsa_information(LIBBALSA_INFORMATION_WARNING,
                 _("Error showing %s: %s\n"), url, err->message);

Modified: trunk/src/balsa-mime-widget.h
==============================================================================
--- trunk/src/balsa-mime-widget.h	(original)
+++ trunk/src/balsa-mime-widget.h	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 #ifndef __BALSA_MIME_WIDGET_H__
 #define __BALSA_MIME_WIDGET_H__
 
-#include <gnome.h>
 #include "libbalsa.h"
 #include "balsa-message.h"
 

Modified: trunk/src/filter-edit-callbacks.c
==============================================================================
--- trunk/src/filter-edit-callbacks.c	(original)
+++ trunk/src/filter-edit-callbacks.c	Sun Nov 16 04:07:05 2008
@@ -31,7 +31,6 @@
 #  include <pthread.h>
 #endif
 #include <time.h>
-#include <gnome.h>
 
 #include <string.h>
 #include "filter.h"
@@ -44,6 +43,12 @@
 #include <glib/gi18n.h>
 #include "libbalsa-conf.h"
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 /* Defined in filter-edit-dialog.c*/
 extern option_list fe_search_type[4];
 extern GList * fe_user_headers_list;
@@ -815,7 +820,9 @@
                           gpointer throwaway)
 {
     LibBalsaCondition *new_cnd;
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err;
+#endif
 
     switch (response) {
     case GTK_RESPONSE_OK:       /* OK button */
@@ -871,8 +878,14 @@
         gtk_widget_hide(dialog);
         break;
     case GTK_RESPONSE_HELP:     /* Help button */
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
 	err = NULL;
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?win-condition",
+                     gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
 	gnome_help_display("balsa", "win-condition", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 	if (err) {
 	    balsa_information_parented(GTK_WINDOW(dialog),
 		    LIBBALSA_INFORMATION_WARNING,
@@ -880,6 +893,7 @@
 		    err->message);
 	    g_error_free(err);
 	}
+#endif
 	break;
     }
     gtk_widget_set_sensitive(fe_window, TRUE);
@@ -1435,7 +1449,9 @@
         gtk_tree_view_get_model(fe_filters_list);
     GtkTreeIter iter;
     gboolean valid;
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err;
+#endif
     
     switch (response) {
     case GTK_RESPONSE_OK:       /* OK button */
@@ -1474,8 +1490,14 @@
         break;
 
     case GTK_RESPONSE_HELP:     /* Help button */
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
 	err = NULL;
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?win-filters",
+                     gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
 	gnome_help_display("balsa", "win-filters", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 	if (err) {
 	    balsa_information_parented(GTK_WINDOW(dialog),
 		    LIBBALSA_INFORMATION_WARNING,
@@ -1483,6 +1505,7 @@
 		    err->message);
 	    g_error_free(err);
 	}
+#endif
 	break;
 
     default:

Modified: trunk/src/filter-run-callbacks.c
==============================================================================
--- trunk/src/filter-run-callbacks.c	(original)
+++ trunk/src/filter-run-callbacks.c	Sun Nov 16 04:07:05 2008
@@ -35,6 +35,12 @@
 
 #include <glib/gi18n.h>	/* Must come after balsa-app.h. */
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 /* Global vars */
 
 extern GList * fr_dialogs_opened;
@@ -159,7 +165,9 @@
 			gpointer throwaway)
 {
     BalsaFilterRunDialog * p;
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err;
+#endif
 
     p=BALSA_FILTER_RUN_DIALOG(widget);
     switch (response) {
@@ -174,8 +182,14 @@
 	
 	break;
     case GTK_RESPONSE_HELP:     /* Help button */
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
 	err = NULL;
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?win-run-filters",
+                     gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
 	gnome_help_display("balsa", "win-run-filters", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 	if (err) {
 	    balsa_information_parented(GTK_WINDOW(widget),
 		    LIBBALSA_INFORMATION_WARNING,
@@ -183,6 +197,7 @@
 		    err->message);
 	    g_error_free(err);
 	}
+#endif
 	return;
 
     default:

Modified: trunk/src/folder-conf.c
==============================================================================
--- trunk/src/folder-conf.c	(original)
+++ trunk/src/folder-conf.c	Sun Nov 16 04:07:05 2008
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-#include <gnome.h>
 #include <string.h>
 #include "balsa-app.h"
 #include "balsa-icons.h"
@@ -32,6 +31,12 @@
 #include "imap-server.h"
 #include <glib/gi18n.h>
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 typedef struct _CommonDialogData CommonDialogData;
 typedef struct _FolderDialogData FolderDialogData;
 typedef struct _SubfolderDialogData SubfolderDialogData;
@@ -83,13 +88,13 @@
         g_free(cdd);
 }
 
-static const gchar folder_config_section[] = "folder-config";
-
 static void
 folder_conf_response(GtkDialog * dialog, int response,
                      CommonDialogData * cdd)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err = NULL;
+#endif
 
     /* If mbnode's parent gets rescanned, mbnode will be finalized,
      * which triggers folder_conf_destroy_cdd, and recursively calls
@@ -99,13 +104,20 @@
 	g_object_ref(cdd->mbnode);
     switch (response) {
     case GTK_RESPONSE_HELP:
-        gnome_help_display("balsa", folder_config_section, &err);
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?folder-config",
+                     gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
+        gnome_help_display("balsa", "folder-config", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
         if (err) {
             balsa_information(LIBBALSA_INFORMATION_WARNING,
-		    _("Error displaying %s: %s\n"), folder_config_section,
-                    err->message);
+                              _("Error displaying config help: %s\n"),
+                              err->message);
             g_error_free(err);
         }
+#endif
 	if (cdd->mbnode)
 	    g_object_unref(cdd->mbnode);
         return;

Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c	(original)
+++ trunk/src/main-window.c	Sun Nov 16 04:07:05 2008
@@ -30,7 +30,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <gnome.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef HAVE_NOTIFY
@@ -61,6 +60,14 @@
 #include "toolbar-prefs.h"
 #include "toolbar-factory.h"
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
+#include <gnome.h> /* for gnome_triggers_do() */
+
 #ifdef BALSA_USE_THREADS
 #include "threads.h"
 #endif
@@ -2519,14 +2526,20 @@
 static void
 bw_contents_cb(void)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err = NULL;
 
+#if GTK_CHECK_VERSION(2, 14, 0)
+    gtk_show_uri(NULL, "ghelp:balsa", gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
     gnome_help_display("balsa", NULL, &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
     if (err) {
         balsa_information(LIBBALSA_INFORMATION_WARNING,
                           _("Error displaying help: %s\n"), err->message);
         g_error_free(err);
     }
+#endif
 }
 
 /*
@@ -4094,7 +4107,9 @@
 	gtk_entry_set_activates_default(GTK_ENTRY(search_entry), TRUE);
         gtk_dialog_set_default_response(GTK_DIALOG(dia), GTK_RESPONSE_OK);
 	do {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
 	    GError *err = NULL;
+#endif
 
 	    ok=gtk_dialog_run(GTK_DIALOG(dia));
             switch(ok) {
@@ -4129,13 +4144,20 @@
                     ok = GTK_RESPONSE_CANCEL; 
                 break;
 	    case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0)
+                gtk_show_uri(NULL, "ghelp:balsa?win-search",
+                             gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
 		gnome_help_display("balsa", "win-search", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 		if (err) {
 		    balsa_information(LIBBALSA_INFORMATION_WARNING,
 				      _("Error displaying help: %s\n"),
 				      err->message);
 		    g_error_free(err);
 		}
+#endif
 		break;
             case FIND_RESPONSE_RESET:
 		bw_reset_filter_cb(NULL, window);

Modified: trunk/src/message-window.c
==============================================================================
--- trunk/src/message-window.c	(original)
+++ trunk/src/message-window.c	Sun Nov 16 04:07:05 2008
@@ -32,6 +32,7 @@
 #include "mailbox-node.h"
 
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 /* callbacks */
 static void destroy_message_window(GtkWidget * widget, MessageWindow * mw);

Modified: trunk/src/pref-manager.c
==============================================================================
--- trunk/src/pref-manager.c	(original)
+++ trunk/src/pref-manager.c	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 /* MAKE SURE YOU USE THE HELPER FUNCTIONS, like create_table(, page), etc. */
 #include "config.h"
 
-#include <gnome.h>
 #include "balsa-app.h"
 #include "pref-manager.h"
 #include "mailbox-conf.h"
@@ -35,6 +34,12 @@
 #include "misc.h"
 #include "imap-server.h"
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 #if ENABLE_ESMTP
 #include <libesmtp.h>
 #include <string.h>
@@ -3386,12 +3391,16 @@
 static void
 balsa_help_pbox_display(void)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GtkTreeSelection *selection;
     GtkTreeModel *model;
     GtkTreeIter iter;
     gchar *text, *p;
     gchar *link_id;
     GError *err = NULL;
+#if GTK_CHECK_VERSION(2, 14, 0)
+    gchar *uri;
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pui->view));
     if (!gtk_tree_selection_get_selected(selection, &model, &iter))
@@ -3403,7 +3412,13 @@
     link_id = g_strconcat("preferences-", text, NULL);
     g_free(text);
 
+#if GTK_CHECK_VERSION(2, 14, 0)
+    uri = g_strconcat("ghelp:balsa?", link_id, NULL);
+    gtk_show_uri(NULL, uri, gtk_get_current_event_time(), &err);
+    g_free(uri);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
     gnome_help_display("balsa", link_id, &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
     if (err) {
         balsa_information(LIBBALSA_INFORMATION_WARNING,
 		_("Error displaying link_id %s: %s\n"),
@@ -3412,6 +3427,7 @@
     }
 
     g_free(link_id);
+#endif
 }
 
 /* pm_page: methods for making the contents of a notebook page

Modified: trunk/src/sendmsg-window.c
==============================================================================
--- trunk/src/sendmsg-window.c	(original)
+++ trunk/src/sendmsg-window.c	Sun Nov 16 04:07:05 2008
@@ -1809,7 +1809,7 @@
     g_return_if_fail(uri != NULL);
 
     g_message("open URL %s", uri);
-    gnome_url_show(uri, &err);
+    gtk_show_uri(NULL, uri, gtk_get_current_event_time(), &err);
     if (err) {
         balsa_information(LIBBALSA_INFORMATION_WARNING,
 			  _("Error showing %s: %s\n"),

Modified: trunk/src/spell-check.c
==============================================================================
--- trunk/src/spell-check.c	(original)
+++ trunk/src/spell-check.c	Sun Nov 16 04:07:05 2008
@@ -24,7 +24,6 @@
 #define USE_ORIGINAL_MANAGER_FUNCS
 
 #include <ctype.h>
-#include <gnome.h>
 /* use old 0.11-style API in pspell */
 #define USE_ORIGINAL_MANAGER_FUNCS
 #include <pspell/pspell.h>

Modified: trunk/src/spell-check.h
==============================================================================
--- trunk/src/spell-check.h	(original)
+++ trunk/src/spell-check.h	Sun Nov 16 04:07:05 2008
@@ -26,9 +26,6 @@
 
 #define USE_ORIGINAL_MANAGER_FUNCS
 
-
-#include <gnome.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif				/* __cplusplus */

Modified: trunk/src/toolbar-prefs.c
==============================================================================
--- trunk/src/toolbar-prefs.c	(original)
+++ trunk/src/toolbar-prefs.c	Sun Nov 16 04:07:05 2008
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <gnome.h>
 #include <glib/gi18n.h>
 
 #include "balsa-app.h"
@@ -33,11 +32,20 @@
 #include "toolbar-factory.h"
 #include "toolbar-prefs.h"
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#ifdef HAVE_GNOME
+#include <gnome.h>
+#endif
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
+
 #ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
 #define OLD_BALSA_COMPATIBILITY_TRANSLATION
+#ifdef OLD_BALSA_COMPATIBILITY_TRANSLATION
+#include <gnome.h> /* for GNOME_STOCK_* pixmaps */
+#endif
 
 /* Enumeration for GtkTreeModel columns. */
 enum {
@@ -378,7 +386,9 @@
 static void
 tp_dialog_response_cb(GtkDialog * dialog, gint response, gpointer data)
 {
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
     GError *err = NULL;
+#endif
 
     switch (response) {
     case GTK_RESPONSE_DELETE_EVENT:
@@ -386,13 +396,20 @@
         gtk_widget_destroy(GTK_WIDGET(dialog));
         break;
     case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION(2, 14, 0) || HAVE_GNOME
+#if GTK_CHECK_VERSION(2, 14, 0)
+        gtk_show_uri(NULL, "ghelp:balsa?toolbar-prefs",
+                     gtk_get_current_event_time(), &err);
+#else                           /* GTK_CHECK_VERSION(2, 14, 0) */
         gnome_help_display("balsa", "toolbar-prefs", &err);
+#endif                          /* GTK_CHECK_VERSION(2, 14, 0) */
         if (err) {
             balsa_information(LIBBALSA_INFORMATION_WARNING,
 		    _("Error displaying toolbar help: %s\n"),
 		    err->message);
             g_error_free(err);
         }
+#endif
         break;
     default:
         break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]