summaryrefslogtreecommitdiff
path: root/time/gnotime/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'time/gnotime/patches/patch-aa')
-rw-r--r--time/gnotime/patches/patch-aa63
1 files changed, 60 insertions, 3 deletions
diff --git a/time/gnotime/patches/patch-aa b/time/gnotime/patches/patch-aa
index e2eacf8a833..2acb538d0c8 100644
--- a/time/gnotime/patches/patch-aa
+++ b/time/gnotime/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/24 22:35:25 kristerw Exp $
---- src/main.c.orig 2004-10-22 21:53:30.000000000 +0200
-+++ src/main.c 2004-10-22 21:53:36.000000000 +0200
+--- src/main.c.orig Mon Apr 26 00:46:20 2004
++++ src/main.c Wed Nov 24 22:31:20 2004
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <utime.h>
@@ -11,3 +11,60 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/10/23 06:51:00 jdolecek Exp $
#endif
#include <qof.h>
+@@ -299,6 +299,7 @@
+ char * xml_filepath;
+ gboolean read_is_ok;
+ char *errmsg, *qmsg;
++ GtkWidget *mb;
+
+ xml_filepath = resolve_old_path (config_data_url);
+
+@@ -347,7 +348,6 @@
+ _("Do you want to continue?"),
+ NULL);
+
+- GtkWidget *mb;
+ mb = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+@@ -398,13 +398,13 @@
+ {
+ const char *fp;
+ char *errmsg, *qmsg;
++ GtkWidget *mb;
+ fp = gtt_get_config_filepath();
+ errmsg = gtt_err_to_string (conf_errcode, fp);
+ qmsg = g_strconcat (errmsg,
+ _("Shall I setup a new configuration?"),
+ NULL);
+
+- GtkWidget *mb;
+ mb = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+@@ -724,6 +724,8 @@
+ memset(&reapchildren, 0, sizeof reapchildren);
+ #endif /* WNOHANG/SA_NOCLDWAIT */
+
++ {
++ GnomeClient *client;
+ static char *geometry_string = NULL;
+ static const struct poptOption geo_options[] =
+ {
+@@ -745,7 +747,7 @@
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ textdomain(GETTEXT_PACKAGE);
+
+- GnomeClient *client = gnome_master_client();
++ client = gnome_master_client();
+ g_signal_connect(G_OBJECT(client), "save_yourself",
+ G_CALLBACK(save_state), (gpointer) argv[0]);
+ g_signal_connect(G_OBJECT(client), "die",
+@@ -806,6 +808,7 @@
+
+ scm_boot_guile (argc, argv, guile_inner_main, NULL);
+ return 0; /* not reached !? */
++ }
+ }
+
+ /* ======================= END OF FILE =================== */