GNOME.org
 

seahorse r2205 - in seahorse-plugins/trunk: . agent libseahorse plugins/applet plugins/epiphany plugins/gedit plugins/nautilus plugins/nautilus-ext

Author: sadam
Date: Mon May  5 00:32:18 2008
New Revision: 2205
URL: http://svn.gnome.org/viewvc/seahorse?rev=2205&view=rev

Log:
2008-05-04  Adam Schreiber  <sadam clemson edu>

    * plugins/nautilus-ext/Makefile.am:
    * plugins/nautilus/seahorse-tool-files.c:
    * plugins/nautilus/seahorse-tool.c:
    * plugins/nautilus/seahorse-tool-progress.c:
    * plugins/nautilus/seahorse-pgp-preferences.c:
    * plugins/applet/seahorse-applet.c:
    * plugins/gedit/seahorse-gedit-bonobo.c:
    * plugins/epiphany/seahorse-extension.c:
    * configure.in:
    * agent/seahorse-agent-actions.c:
    * agent/seahorse-agent-prompt.c:
    * agent/seahorse-agent.c:
    * agent/seahorse-agent-cache.c:
    * agent/seahorse-agent-status.c:
    * agent/seahorse-agent-main.c:
    * agent/seahorse-agent-io.c:
    * libseahorse/seahorse-unix-signal.c:
    * libseahorse/seahorse-vfs-data.h:
    * libseahorse/seahorse-util.c:
    * libseahorse/seahorse-widget.c:
    * libseahorse/seahorse-operation.c:
    * libseahorse/seahorse-gpg-options.c:
    * libseahorse/seahorse-prefs-cache.c: Remove dependence on 
libgnome/ui.
    Patch from Saleem Abdulrasool. Fixes bug #524018


Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/agent/seahorse-agent-actions.c
   seahorse-plugins/trunk/agent/seahorse-agent-cache.c
   seahorse-plugins/trunk/agent/seahorse-agent-io.c
   seahorse-plugins/trunk/agent/seahorse-agent-main.c
   seahorse-plugins/trunk/agent/seahorse-agent-prompt.c
   seahorse-plugins/trunk/agent/seahorse-agent-status.c
   seahorse-plugins/trunk/agent/seahorse-agent.c
   seahorse-plugins/trunk/configure.in
   seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c
   seahorse-plugins/trunk/libseahorse/seahorse-operation.c
   seahorse-plugins/trunk/libseahorse/seahorse-prefs-cache.c
   seahorse-plugins/trunk/libseahorse/seahorse-unix-signal.c
   seahorse-plugins/trunk/libseahorse/seahorse-util.c
   seahorse-plugins/trunk/libseahorse/seahorse-vfs-data.h
   seahorse-plugins/trunk/libseahorse/seahorse-widget.c
   seahorse-plugins/trunk/plugins/applet/seahorse-applet.c
   seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c
   seahorse-plugins/trunk/plugins/gedit/seahorse-gedit-bonobo.c
   seahorse-plugins/trunk/plugins/nautilus-ext/Makefile.am
   seahorse-plugins/trunk/plugins/nautilus/seahorse-pgp-preferences.c
   seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-files.c
   seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c
   seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c

Modified: seahorse-plugins/trunk/agent/seahorse-agent-actions.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-actions.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-actions.c	Mon May  5 00:32:18 2008
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "seahorse-gconf.h"
 #include "seahorse-agent.h"

Modified: seahorse-plugins/trunk/agent/seahorse-agent-cache.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-cache.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-cache.c	Mon May  5 00:32:18 2008
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include <gnome-keyring.h>
 #include <gnome-keyring-memory.h>

Modified: seahorse-plugins/trunk/agent/seahorse-agent-io.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-io.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-io.c	Mon May  5 00:32:18 2008
@@ -34,8 +34,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-#include <gnome.h>
-
 #include "seahorse-agent.h"
 
 /* Set from seahorse-agent-main.c */

Modified: seahorse-plugins/trunk/agent/seahorse-agent-main.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-main.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-main.c	Mon May  5 00:32:18 2008
@@ -18,6 +18,7 @@
  * 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -29,10 +30,10 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <errno.h>
+  
+#include <glib/gi18n.h>
 
-#include <gnome.h>
-
-#include "config.h"
 #include "seahorse-gtkstock.h"
 #include "seahorse-gconf.h"
 #include "seahorse-agent.h"
@@ -127,7 +128,7 @@
             exit (0);
 
         execvp (exec[0], (char**)exec);
-	    g_critical ("couldn't exec %s: %s\n", exec[0], strerror (errno));
+	    g_critical ("couldn't exec %s: %s\n", exec[0], g_strerror (errno));
 	    exit (1);
 
     }
@@ -198,15 +199,8 @@
     g_log_set_handler ("Gnome", flags, log_handler, NULL);
 }
 
-static void
-client_die ()
-{
-    gtk_main_quit ();
-}
-
 int main(int argc, char* argv[])
 {
-    GnomeClient *client = NULL;
     GOptionContext *octx = NULL;
 
     seahorse_secure_memory_init ();
@@ -218,10 +212,7 @@
     octx = g_option_context_new ("");
     g_option_context_add_main_entries (octx, options, GETTEXT_PACKAGE);
 
-    gnome_program_init("seahorse-agent", VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                    GNOME_PARAM_GOPTION_CONTEXT, octx,
-                    GNOME_PARAM_HUMAN_READABLE_NAME, _("Encryption Key Agent (Seahorse)"),
-                    GNOME_PARAM_APP_DATADIR, DATA_DIR, NULL);
+    gtk_init_with_args (&argc, &argv, _("Encryption Key Agent (Seahorse)"), (GOptionEntry *) options, GETTEXT_PACKAGE, NULL);
 
     seahorse_agent_prefork ();
 
@@ -246,9 +237,6 @@
     if (!agent_no_daemonize)
         seahorse_gconf_disconnect ();    
     
-    client = gnome_master_client();
-    g_signal_connect(client, "die", G_CALLBACK(client_die), NULL);
-    
     /* We log to the syslog */
     prepare_logging ();
 

Modified: seahorse-plugins/trunk/agent/seahorse-agent-prompt.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-prompt.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-prompt.c	Mon May  5 00:32:18 2008
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "seahorse-agent.h"
 #include "seahorse-check-button-control.h"

Modified: seahorse-plugins/trunk/agent/seahorse-agent-status.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-status.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-status.c	Mon May  5 00:32:18 2008
@@ -23,8 +23,9 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
+#include <glib/gi18n.h>
+
 #include <gtk/gtk.h>
-#include <gnome.h>
 #include <glade/glade-xml.h>
 
 #include "seahorse-agent.h"

Modified: seahorse-plugins/trunk/agent/seahorse-agent.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent.c	Mon May  5 00:32:18 2008
@@ -32,8 +32,6 @@
 #include <syslog.h>
 #include <fcntl.h>
 
-#include <gnome.h>
-
 #include "seahorse-agent.h"
 #include "seahorse-gpg-options.h"
 #include "seahorse-passphrase.h"

Modified: seahorse-plugins/trunk/configure.in
==============================================================================
--- seahorse-plugins/trunk/configure.in	(original)
+++ seahorse-plugins/trunk/configure.in	Mon May  5 00:32:18 2008
@@ -591,7 +591,7 @@
 	    [Compile binaries in debug mode]))
 
 if test "$enable_debug" = "yes"; then
-  CFLAGS="$CFLAGS -g -O0 -Wall"
+  CFLAGS="$CFLAGS -g -O0 -DBONOBO_DISABLE_DEPRECATED -DDISABLE_DEPRECATED -Wall -Werror"
   AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode])
   echo "enabling debug compile mode"
 else 

Modified: seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-gpg-options.c	Mon May  5 00:32:18 2008
@@ -28,6 +28,8 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
 
 #include "seahorse-gpgmex.h"
 #include "seahorse-util.h"

Modified: seahorse-plugins/trunk/libseahorse/seahorse-operation.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-operation.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-operation.c	Mon May  5 00:32:18 2008
@@ -22,6 +22,7 @@
 #include <gtk/gtk.h>
 
 #include "config.h"
+
 #include "seahorse-util.h"
 #include "seahorse-marshal.h"
 #include "seahorse-operation.h"

Modified: seahorse-plugins/trunk/libseahorse/seahorse-prefs-cache.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-prefs-cache.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-prefs-cache.c	Mon May  5 00:32:18 2008
@@ -106,7 +106,7 @@
     gint ttl;
     gboolean set;
     
-    if (strcmp (gconf_key, SETTING_CACHE) == 0) {
+    if (g_strcmp0 (gconf_key, SETTING_CACHE) == 0) {
         
         set = seahorse_gconf_get_boolean (SETTING_CACHE);
         if (!set) {
@@ -118,10 +118,10 @@
         return;
     }
     
-    if (strcmp (gconf_key, SETTING_METHOD) == 0) {
+    if (g_strcmp0 (gconf_key, SETTING_METHOD) == 0) {
         
         str = seahorse_gconf_get_string (SETTING_METHOD);
-        if (!str || strcmp (str, METHOD_GNOME) != 0)
+        if (!str || g_strcmp0 (str, METHOD_GNOME) != 0)
             widget = seahorse_widget_get_widget (swidget, "session-cache");
         else
             widget = seahorse_widget_get_widget (swidget, "keyring-cache");
@@ -133,7 +133,7 @@
         return;
     }
     
-    if (strcmp (gconf_key, SETTING_TTL) == 0) {
+    if (g_strcmp0 (gconf_key, SETTING_TTL) == 0) {
         
         ttl = seahorse_gconf_get_integer (SETTING_TTL);
         if (ttl < 0)
@@ -214,8 +214,7 @@
 void
 seahorse_prefs_cache (SeahorseWidget *swidget)
 {
-    GtkWidget *w, *w2;
-    gboolean display_start = FALSE;
+    GtkWidget *w;
     
     g_return_if_fail (swidget != NULL);
 

Modified: seahorse-plugins/trunk/libseahorse/seahorse-unix-signal.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-unix-signal.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-unix-signal.c	Mon May  5 00:32:18 2008
@@ -29,8 +29,9 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <string.h>
+#include <errno.h>
 
-#include <gnome.h>
 #include "seahorse-unix-signal.h"
 
 #define MAX_SIGNAL 32

Modified: seahorse-plugins/trunk/libseahorse/seahorse-util.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-util.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-util.c	Mon May  5 00:32:18 2008
@@ -45,8 +45,6 @@
 #include "seahorse-gconf.h"
 #include "seahorse-vfs-data.h"
 
-static const gchar *bad_filename_chars = "/\\<>|";
-
 void
 seahorse_util_show_error (GtkWindow *parent, const gchar *heading, const gchar *message)
 {

Modified: seahorse-plugins/trunk/libseahorse/seahorse-vfs-data.h
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-vfs-data.h	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-vfs-data.h	Mon May  5 00:32:18 2008
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <libgnomevfs/gnome-vfs-file-size.h>
+
 /**
  * A gpgme_data_t implementation which maps to a gnome-vfs handle.
  * Allows for accessing data on remote machines (ie: smb, sftp)

Modified: seahorse-plugins/trunk/libseahorse/seahorse-widget.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-widget.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-widget.c	Mon May  5 00:32:18 2008
@@ -23,7 +23,10 @@
 #include "config.h"
 
 #include <string.h>
+
 #include <gtk/gtk.h>
+#include <gio/gio.h>
+
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <glade/glade-build.h>
@@ -64,9 +67,6 @@
                                       GdkEvent              *event,
                                       SeahorseWidget        *swidget);
 
-static void     context_destroyed    (GtkObject             *object,
-                                      SeahorseWidget        *swidget);
-
 static GtkObjectClass *parent_class = NULL;
 
 /* Hash of widgets with name as key */
@@ -126,7 +126,7 @@
 	/* Remove widget from hash and destroy hash if empty */
     if (widgets) {
     	g_hash_table_remove (widgets, swidget->name);
-    	if (g_hash_table_size == 0) {
+    	if (g_hash_table_size (widgets) == 0) {
     		g_hash_table_destroy (widgets);
     		widgets = NULL;
     	}
@@ -304,25 +304,32 @@
 void
 seahorse_widget_show_help (SeahorseWidget *swidget)
 {
+    gchar *document = NULL;
     GError *err = NULL;
+    gboolean error;
 
     if (g_str_equal (swidget->name, "key-manager") || 
-        g_str_equal (swidget->name, "keyserver-results"))
-        gnome_help_display_with_doc_id (NULL, PACKAGE, PACKAGE, "introduction", &err);
-    else
-       gnome_help_display_with_doc_id (NULL, PACKAGE, PACKAGE, swidget->name, &err);
+        g_str_equal (swidget->name, "keyserver-results")) {
+        document = g_strdup ("ghelp:" PACKAGE "?introduction");
+    } else {
+        document = g_strdup_printf ("ghelp:" PACKAGE "?%s", swidget->name);
+    }
+
+    error = g_app_info_launch_default_for_uri (document, NULL, &err);
+    g_free (document);
 
-    if (err != NULL) {
+    if (error != TRUE) {
         GtkWidget *dialog;
 
         dialog = gtk_message_dialog_new (GTK_WINDOW (seahorse_widget_get_top (swidget)), GTK_DIALOG_MODAL, 
                                          GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
                                          _("Could not display help: %s"),
                                          err->message);
+        g_error_free (err);
+                                 
         g_signal_connect (G_OBJECT (dialog), "response",
                           G_CALLBACK (gtk_widget_destroy), NULL);
         gtk_widget_show (dialog);
-        g_error_free (err);
     }
 }
 

Modified: seahorse-plugins/trunk/plugins/applet/seahorse-applet.c
==============================================================================
--- seahorse-plugins/trunk/plugins/applet/seahorse-applet.c	(original)
+++ seahorse-plugins/trunk/plugins/applet/seahorse-applet.c	Mon May  5 00:32:18 2008
@@ -20,7 +20,13 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib/gi18n.h>
+#include <libgnomevfs/gnome-vfs.h>
+
 #include <panel-applet.h>
 
 #include <dbus/dbus-glib-bindings.h>
@@ -261,7 +267,21 @@
                                            const gchar *url,
                                            gpointer data)
 {
-	gnome_url_show (url, NULL);
+    GnomeVFSResult error;
+
+	error = gnome_vfs_url_show (url);
+	
+	if (error != GNOME_VFS_OK) {
+        GtkWidget *dialog;
+
+        dialog = gtk_message_dialog_new (GTK_WINDOW (about), GTK_DIALOG_MODAL, 
+                                         GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
+                                         _("Could not display URL: %s"),
+                                         gnome_vfs_result_to_string (error));
+        g_signal_connect (G_OBJECT (dialog), "response",
+                          G_CALLBACK (gtk_widget_destroy), NULL);
+        gtk_widget_show (dialog);
+    }
 }
 
 static void
@@ -667,11 +687,22 @@
 static void
 help_cb (BonoboUIComponent *uic, SeahorseApplet *sapplet, const char *verbname)
 {
-    GError *err = NULL;
+    gchar const *document = "ghelp:seahorse-applet";
+    GnomeVFSResult error;
     
-    gnome_help_display ("seahorse-applet", NULL, &err);
-    if (err)
-        seahorse_util_handle_error(err, _("Could not display the help file"));
+    error = gnome_vfs_url_show (document);
+
+    if (error != GNOME_VFS_OK) {
+        GtkWidget *dialog;
+
+        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, 
+                                         GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
+                                         _("Could not display help: %s"),
+                                         gnome_vfs_result_to_string (error));
+        g_signal_connect (G_OBJECT (dialog), "response",
+                          G_CALLBACK (gtk_widget_destroy), NULL);
+        gtk_widget_show (dialog);
+    }
 }
 
 static void

Modified: seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c
==============================================================================
--- seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c	(original)
+++ seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c	Mon May  5 00:32:18 2008
@@ -25,6 +25,7 @@
 
 #include <epiphany/ephy-extension.h>
 #include <epiphany/ephy-embed.h>
+#include <epiphany/ephy-embed-container.h>
 
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
@@ -239,7 +240,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */
@@ -285,7 +286,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */
@@ -419,7 +420,7 @@
     
     init_crypt();
     
-	embed = ephy_window_get_active_embed (window);
+	embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window));
 	g_return_if_fail (EPHY_IS_EMBED (embed));
 
 	/* ask gecko for the input */

Modified: seahorse-plugins/trunk/plugins/gedit/seahorse-gedit-bonobo.c
==============================================================================
--- seahorse-plugins/trunk/plugins/gedit/seahorse-gedit-bonobo.c	(original)
+++ seahorse-plugins/trunk/plugins/gedit/seahorse-gedit-bonobo.c	Mon May  5 00:32:18 2008
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 
 #include <errno.h>
 #include <unistd.h>

Modified: seahorse-plugins/trunk/plugins/nautilus-ext/Makefile.am
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus-ext/Makefile.am	(original)
+++ seahorse-plugins/trunk/plugins/nautilus-ext/Makefile.am	Mon May  5 00:32:18 2008
@@ -4,7 +4,6 @@
 	$(NAUTILUS_CFLAGS) 			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
-# There doesn't seem to be a way to get this dynamically
 nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
 
 nautilus_extension_LTLIBRARIES=libnautilus-seahorse.la

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-pgp-preferences.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-pgp-preferences.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-pgp-preferences.c	Mon May  5 00:32:18 2008
@@ -20,8 +20,11 @@
  */
 
 #include <config.h>
-#include <gnome.h>
+
+#include <stdlib.h>
 #include <locale.h>
+  
+#include <glib/gi18n.h>
 
 #include "seahorse-prefs.h"
 #include "seahorse-gtkstock.h"
@@ -29,9 +32,6 @@
 #ifdef WITH_AGENT
 static gboolean show_cache = FALSE;
 #endif
-#ifdef WITH_APPLET
-static gboolean show_applet = FALSE;
-#endif
 
 static const GOptionEntry options[] = {
 #ifdef WITH_AGENT    
@@ -44,7 +44,7 @@
 static void
 destroyed (GtkObject *object, gpointer data)
 {
-	gtk_exit (0);
+	exit (0);
 }
 
 int
@@ -60,10 +60,7 @@
     octx = g_option_context_new ("");
     g_option_context_add_main_entries (octx, options, GETTEXT_PACKAGE);
 
-    gnome_program_init ("seahorse-preferences", VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                GNOME_PARAM_GOPTION_CONTEXT, octx,
-                GNOME_PARAM_HUMAN_READABLE_NAME, _("Encryption Preferences"),
-                GNOME_PARAM_APP_DATADIR, DATA_DIR, NULL);
+    gtk_init_with_args (&argc, &argv, _("Encryption Preferences"), (GOptionEntry *) options, GETTEXT_PACKAGE, NULL);
 
     /* Insert Icons into Stock */ 
     seahorse_gtkstock_init();

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-files.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-files.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-files.c	Mon May  5 00:32:18 2008
@@ -20,12 +20,16 @@
  */
 
 #include "config.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <libintl.h>
 
-#include <gnome.h>
+#include <glib/gi18n.h>
+
 #include <libgnomevfs/gnome-vfs.h>
 
 #include "seahorse-tool.h"

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c	Mon May  5 00:32:18 2008
@@ -20,10 +20,11 @@
  */
 
 #include "config.h"
+
 #include <sys/types.h>
 #include <signal.h>
+#include <stdlib.h>
 
-#include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
 
 #include "seahorse-gtkstock.h"
@@ -240,7 +241,7 @@
     int r;
     
     /* Progress mode */
-    if (argc >= 2 && strcmp(argv[1], PROGRESS_ARG) == 0) {
+    if (argc >= 2 && g_strcmp0 (argv[1], PROGRESS_ARG) == 0) {
         r = progress_main (argc, argv);
         exit (r);
     }

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-tool.c	Mon May  5 00:32:18 2008
@@ -20,9 +20,14 @@
  */
 
 #include "config.h"
-#include <gnome.h>
+
+#include <errno.h>
+#include <string.h>
+
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gprintf.h>
+
 #include <libgnomevfs/gnome-vfs.h>
 
 #include <dbus/dbus-glib-bindings.h>
@@ -650,11 +655,7 @@
     octx = g_option_context_new ("");
     g_option_context_add_main_entries (octx, options, GETTEXT_PACKAGE);
 
-    /* Main operation process */
-    gnome_program_init("seahorse-tool", VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                       GNOME_PARAM_GOPTION_CONTEXT, octx,
-                       GNOME_PARAM_HUMAN_READABLE_NAME, _("File Encryption Tool"),
-                       GNOME_PARAM_APP_DATADIR, DATA_DIR, NULL);
+    gtk_init_with_args (&argc, &argv, _("File Encryption Tool"), (GOptionEntry *) options, GETTEXT_PACKAGE, NULL);
 
     /* Load up all our arguments */
     uris = read_uri_arguments ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]