summaryrefslogtreecommitdiffstats
path: root/deskutils/gnomeutils2/files
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/gnomeutils2/files')
-rw-r--r--deskutils/gnomeutils2/files/patch-ai11
-rw-r--r--deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c29
-rw-r--r--deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview__logview.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_calendar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_loglist.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logrtns.c52
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_logview-findbar.h10
-rw-r--r--deskutils/gnomeutils2/files/patch-logview_misc.c21
9 files changed, 163 insertions, 0 deletions
diff --git a/deskutils/gnomeutils2/files/patch-ai b/deskutils/gnomeutils2/files/patch-ai
new file mode 100644
index 000000000..927a2b461
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-ai
@@ -0,0 +1,11 @@
+--- xmldocs.make.orig Thu Aug 7 09:56:16 2003
++++ xmldocs.make Thu Aug 7 13:55:58 2003
+@@ -36,7 +36,7 @@
+ # ********** Begin of section some packagers may need to modify **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++docdir = $(datadir)/help/$(docname)/$(lang)
+
+ # ********** You should not have to edit below this line **********
+ xml_files = $(entities) $(docname).xml
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 000000000..0cc89594e
--- /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-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
new file mode 100644
index 000000000..9d1ee8c9c
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c
@@ -0,0 +1,10 @@
+--- gsearchtool/gsearchtool-support.c.orig Thu Jan 5 23:26:25 2006
++++ gsearchtool/gsearchtool-support.c Thu Jan 5 23:27:04 2006
+@@ -31,6 +31,7 @@
+
+ #include <glib/gi18n.h>
+ #include <glib/gdate.h>
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gdk/gdkx.h>
+ #include <libart_lgpl/art_rgb.h>
diff --git a/deskutils/gnomeutils2/files/patch-logview__logview.h b/deskutils/gnomeutils2/files/patch-logview__logview.h
new file mode 100644
index 000000000..3cd50f68c
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview__logview.h
@@ -0,0 +1,10 @@
+--- logview/logview.h.orig Wed Apr 19 12:39:07 2006
++++ logview/logview.h Wed Apr 19 12:40:08 2006
+@@ -73,6 +73,7 @@
+ void logview_set_window_title (LogviewWindow *window);
+ void logview_set_font (LogviewWindow *window, const gchar *fontname);
+ void logview_show_main_content (LogviewWindow *window);
++GType logview_window_get_type (void);
+ GtkWidget *logview_window_new (void);
+
+ #endif /* __LOGVIEW_H__ */
diff --git a/deskutils/gnomeutils2/files/patch-logview_calendar.h b/deskutils/gnomeutils2/files/patch-logview_calendar.h
new file mode 100644
index 000000000..3aefb999f
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_calendar.h
@@ -0,0 +1,10 @@
+--- logview/calendar.h.orig Tue Apr 18 22:20:35 2006
++++ logview/calendar.h Tue Apr 18 22:20:58 2006
+@@ -45,6 +45,7 @@ typedef struct CalendarClass
+ GtkCalendarClass parent_class;
+ }CalendarClass;
+
++GType calendar_get_type (void);
+ GtkWidget *calendar_new (void);
+ void calendar_select_date (Calendar *calendar, GDate *date);
+ void calendar_init_data (Calendar *calendar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_loglist.h b/deskutils/gnomeutils2/files/patch-logview_loglist.h
new file mode 100644
index 000000000..149e04a59
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_loglist.h
@@ -0,0 +1,10 @@
+--- logview/loglist.h.orig Wed Apr 19 00:30:12 2006
++++ logview/loglist.h Wed Apr 19 00:30:23 2006
+@@ -39,6 +39,7 @@ typedef struct LogListClass
+ GtkTreeViewClass parent_class;
+ }LogListClass;
+
++GType loglist_get_type (void);
+ GtkWidget *loglist_new (void);
+ void loglist_connect (LogList *list, LogviewWindow *window);
+ void loglist_add_log (LogList *list, Log *log);
diff --git a/deskutils/gnomeutils2/files/patch-logview_logrtns.c b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
new file mode 100644
index 000000000..85333d2fe
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logrtns.c
@@ -0,0 +1,52 @@
+--- logview/logrtns.c.orig Wed Apr 19 00:28:00 2006
++++ logview/logrtns.c Wed Apr 19 00:29:24 2006
+@@ -48,7 +48,7 @@ file_exist (char *filename, gboolean sho
+ char *secondary = NULL;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
+ if (result != GNOME_VFS_OK) {
+@@ -83,7 +83,7 @@ file_is_zipped (char *filename)
+ char *mime_type;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ mime_type = gnome_vfs_get_mime_type (filename);
+ if (mime_type == NULL)
+@@ -106,7 +106,7 @@ file_is_log (char *filename, gboolean sh
+ LogStats *stats;
+
+ if (filename == NULL)
+- return;
++ return FALSE;
+
+ stats = log_stats_new (filename, show_error);
+ if (stats==NULL)
+@@ -134,11 +134,11 @@ string_get_date_string (gchar *line)
+ int i=0;
+
+ if (line == NULL || line[0] == 0)
+- return;
++ return NULL;
+
+ split = g_strsplit (line, " ", 4);
+ if (split == NULL)
+- return;
++ return NULL;
+
+ while ((day == NULL || month == NULL) && split[i]!=NULL && i<4) {
+ if (g_str_equal (split[i], "")) {
+@@ -531,7 +531,7 @@ log_unbold (gpointer data)
+ LogList *list;
+ Log *log = data;
+
+- g_return_if_fail (log != NULL);
++ g_return_val_if_fail (log != NULL, FALSE);
+
+ logview = log->window;
+
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
new file mode 100644
index 000000000..1e6acd101
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_logview-findbar.h
@@ -0,0 +1,10 @@
+--- logview/logview-findbar.h.orig Wed Apr 19 00:27:03 2006
++++ logview/logview-findbar.h Wed Apr 19 00:27:17 2006
+@@ -44,6 +44,7 @@ typedef struct LogviewFindBarClass
+ GtkHBoxClass parent_class;
+ }LogviewFindBarClass;
+
++GType logview_findbar_get_type (void);
+ GtkWidget *logview_findbar_new (void);
+ void logview_findbar_connect (LogviewFindBar *findbar, LogviewWindow *logview);
+ void logview_findbar_update_visibility (LogviewFindBar *findbar, LogviewWindow *logview);
diff --git a/deskutils/gnomeutils2/files/patch-logview_misc.c b/deskutils/gnomeutils2/files/patch-logview_misc.c
new file mode 100644
index 000000000..1a0f54cfe
--- /dev/null
+++ b/deskutils/gnomeutils2/files/patch-logview_misc.c
@@ -0,0 +1,21 @@
+--- logview/misc.c.orig Tue Apr 18 21:28:07 2006
++++ logview/misc.c Tue Apr 18 21:28:30 2006
+@@ -135,15 +135,15 @@ string_get_date (char *line)
+ {
+ GDate *date;
+ struct tm tp;
+- int cp;
++ char *cp;
+
+ if (line == NULL || line[0] == 0)
+ return NULL;
+
+ cp = strptime (line, "%b %d", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ cp = strptime (line, "%F", &tp);
+- if (cp == 0) {
++ if (cp == NULL) {
+ return NULL;
+ }
+ }