diff options
Diffstat (limited to 'deskutils/gnomeutils2/files')
8 files changed, 96 insertions, 46 deletions
diff --git a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c new file mode 100644 index 000000000000..0cc89594e169 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c @@ -0,0 +1,29 @@ +--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004 ++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004 +@@ -94,16 +94,20 @@ + gchar *message = NULL; + gchar *error_message = NULL; + GtkWidget *dialog; ++ GIOStatus status; + +- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); +- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); +- dialog = gtk_message_dialog_new (NULL, 0, ++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); ++ if (status == G_IO_STATUS_NORMAL) ++ { ++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); ++ dialog = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + message); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); +- exit (1); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ exit (1); ++ } + } + + (*save_callback) (save_user_data); diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c new file mode 100644 index 000000000000..325e50a3548d --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c @@ -0,0 +1,29 @@ +--- gsearchtool/gsearchtool-callbacks.c.orig Thu Dec 23 19:14:17 2004 ++++ gsearchtool/gsearchtool-callbacks.c Thu Dec 23 19:15:55 2004 +@@ -54,9 +54,11 @@ + quit_application (GSearchCommandDetails * command_details) + { + if (command_details->command_status == RUNNING) { +- command_details->command_status = MAKE_IT_QUIT; + #ifdef HAVE_GETPGID + pid_t pgid; ++#endif ++ command_details->command_status = MAKE_IT_QUIT; ++#ifdef HAVE_GETPGID + + pgid = getpgid (command_details->command_pid); + +@@ -122,10 +124,12 @@ + GSearchWindow * gsearch = data; + + if (gsearch->command_details->command_status == RUNNING) { ++#ifdef HAVE_GETPGID ++ pid_t pgid; ++#endif + gtk_widget_set_sensitive (gsearch->stop_button, FALSE); + gsearch->command_details->command_status = MAKE_IT_STOP; + #ifdef HAVE_GETPGID +- pid_t pgid; + + pgid = getpgid (gsearch->command_details->command_pid); + diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c new file mode 100644 index 000000000000..03a974c23aa4 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c @@ -0,0 +1,10 @@ +--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004 ++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004 +@@ -30,6 +30,7 @@ + #endif + + #include <glib/gi18n.h> ++#include <sys/types.h> + #include <regex.h> + #include <gdk/gdkx.h> + #include <bonobo-activation/bonobo-activation.h> diff --git a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c b/deskutils/gnomeutils2/files/patch-logview::log_repaint.c deleted file mode 100644 index 3944b8205b12..000000000000 --- a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/log_repaint.c 2001/11/23 16:01:55 1.1 -+++ logview/log_repaint.c 2001/11/23 16:02:30 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include <gnome.h> - #include "logview.h" diff --git a/deskutils/gnomeutils2/files/patch-logview::logrtns.h b/deskutils/gnomeutils2/files/patch-logview::logrtns.h deleted file mode 100644 index a39ce6a77b82..000000000000 --- a/deskutils/gnomeutils2/files/patch-logview::logrtns.h +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/logrtns.h 2001/11/23 16:04:00 1.1 -+++ logview/logrtns.h 2001/11/23 16:04:14 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include "logview.h" - diff --git a/deskutils/gnomeutils2/files/patch-logview_desc_db.c b/deskutils/gnomeutils2/files/patch-logview_desc_db.c new file mode 100644 index 000000000000..5b687f492e88 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_desc_db.c @@ -0,0 +1,10 @@ +--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004 ++++ logview/desc_db.c Wed Dec 1 16:45:25 2004 +@@ -21,6 +21,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include "logview.h" + #include "desc_db.h" diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 942ed8a02d6b..4ac243d34e9a 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,37 +1,29 @@ ---- logview/logview.c.orig Fri May 7 21:47:59 2004 -+++ logview/logview.c Wed Aug 4 18:40:24 2004 -@@ -781,7 +781,7 @@ +--- logview/logview.c.orig Tue Nov 30 00:29:01 2004 ++++ logview/logview.c Tue Nov 30 00:30:44 2004 +@@ -656,7 +656,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -804,7 +804,7 @@ +@@ -678,7 +678,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -838,7 +838,7 @@ +@@ -709,7 +709,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); -@@ -922,6 +922,7 @@ - /* remove trailing newline */ - if (logfile[strlen(logfile)-1] == '\n') - logfile[strlen(logfile)-1] = '\0'; -+ if (strcmp (logfile, "/dev/console") == 0) continue; - fprintf(stderr, "Found a logfile: (%s)\n", logfile); - return logfile; - } diff --git a/deskutils/gnomeutils2/files/patch-logview_userprefs.c b/deskutils/gnomeutils2/files/patch-logview_userprefs.c new file mode 100644 index 000000000000..d93f8ae57fc2 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_userprefs.c @@ -0,0 +1,10 @@ +--- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004 ++++ logview/userprefs.c Tue Nov 30 00:36:34 2004 +@@ -56,6 +56,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + return logfile; + } + } |