diff options
Diffstat (limited to 'deskutils/gnome-utils/files')
10 files changed, 118 insertions, 55 deletions
diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure deleted file mode 100644 index d5d7d0e103f2..000000000000 --- a/deskutils/gnome-utils/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Mon Nov 25 09:25:29 2002 -+++ configure Tue Nov 26 16:04:42 2002 -@@ -10347,7 +10347,7 @@ - - - cat >>confdefs.h <<_ACEOF --#define GNOME_ICONDIR "${prefix}/share/pixmaps" -+#define GNOME_ICONDIR "${datadir}/pixmaps" - _ACEOF - - diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c index 03a974c23aa4..9d1ee8c9c55c 100644 --- a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c +++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c @@ -1,10 +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 +--- 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 <bonobo-activation/bonobo-activation.h> + #include <libart_lgpl/art_rgb.h> diff --git a/deskutils/gnome-utils/files/patch-logview__logview.h b/deskutils/gnome-utils/files/patch-logview__logview.h new file mode 100644 index 000000000000..3cd50f68c4bd --- /dev/null +++ b/deskutils/gnome-utils/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/gnome-utils/files/patch-logview_calendar.h b/deskutils/gnome-utils/files/patch-logview_calendar.h new file mode 100644 index 000000000000..3aefb999f00c --- /dev/null +++ b/deskutils/gnome-utils/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/gnome-utils/files/patch-logview_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c deleted file mode 100644 index 5b687f492e88..000000000000 --- a/deskutils/gnome-utils/files/patch-logview_desc_db.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/gnome-utils/files/patch-logview_loglist.h b/deskutils/gnome-utils/files/patch-logview_loglist.h new file mode 100644 index 000000000000..149e04a59abc --- /dev/null +++ b/deskutils/gnome-utils/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/gnome-utils/files/patch-logview_logrtns.c b/deskutils/gnome-utils/files/patch-logview_logrtns.c new file mode 100644 index 000000000000..85333d2fe164 --- /dev/null +++ b/deskutils/gnome-utils/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/gnome-utils/files/patch-logview_logview-findbar.h b/deskutils/gnome-utils/files/patch-logview_logview-findbar.h new file mode 100644 index 000000000000..1e6acd101c08 --- /dev/null +++ b/deskutils/gnome-utils/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/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c deleted file mode 100644 index 5dd057d1a77c..000000000000 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ /dev/null @@ -1,29 +0,0 @@ ---- logview/logview.c.orig Tue Oct 4 12:31:47 2005 -+++ logview/logview.c Tue Oct 4 12:32:04 2005 -@@ -930,7 +930,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", LOGVIEWINSTALLPREFIX); - if (access (full_name, R_OK) == 0) { - found = TRUE; - g_free (cfg->regexp_db_path); -@@ -952,7 +952,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", LOGVIEWINSTALLPREFIX); - if (access (full_name, R_OK) == 0) { - found = TRUE; - g_free (cfg->descript_db_path); -@@ -983,7 +983,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", LOGVIEWINSTALLPREFIX); - if (access (full_name, R_OK) == 0) { - found = TRUE; - g_free (cfg->action_db_path); diff --git a/deskutils/gnome-utils/files/patch-logview_misc.c b/deskutils/gnome-utils/files/patch-logview_misc.c new file mode 100644 index 000000000000..1a0f54cfe5b1 --- /dev/null +++ b/deskutils/gnome-utils/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; + } + } |