diff options
Diffstat (limited to 'mail/evolution-devel/files')
5 files changed, 20 insertions, 244 deletions
diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa index 74028d1fe442..0ab8cde1b418 100644 --- a/mail/evolution-devel/files/patch-aa +++ b/mail/evolution-devel/files/patch-aa @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Tue Sep 4 17:59:26 2001 -+++ configure Tue Sep 4 18:11:25 2001 -@@ -5667,7 +5667,7 @@ +--- configure.orig Tue Sep 11 19:38:48 2001 ++++ configure Tue Sep 11 19:38:55 2001 +@@ -5554,7 +5554,7 @@ CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $DB3_CFLAGS" @@ -12,7 +12,7 @@ $FreeBSD$ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -5741,7 +5741,7 @@ +@@ -5628,7 +5628,7 @@ echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* @@ -21,7 +21,7 @@ $FreeBSD$ fi rm -f conftest* -@@ -5852,7 +5852,7 @@ +@@ -5739,7 +5739,7 @@ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6 if test "$ac_cv_db3_lib_version_match" = no; then @@ -30,29 +30,7 @@ $FreeBSD$ fi CPPFLAGS="$CPPFLAGS_save" -@@ -6333,8 +6333,8 @@ - fi - - --THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`" --THREADS_CFLAGS="`glib-config --cflags gthread`" -+THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`" -+THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`" - - - -@@ -6894,8 +6894,8 @@ - fi - - --GLIB_CFLAGS="`glib-config --cflags`" --GLIB_LIBS="`glib-config --libs`" -+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`" -+GLIB_LIBS="`$GLIB_CONFIG --libs`" - - - -@@ -9415,10 +9415,10 @@ +@@ -9349,10 +9349,10 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/mail/evolution-devel/files/patch-filter::filter-input.c b/mail/evolution-devel/files/patch-filter::filter-input.c deleted file mode 100644 index c25fab446a11..000000000000 --- a/mail/evolution-devel/files/patch-filter::filter-input.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- filter/filter-input.c 2001/09/04 16:51:06 1.1 -+++ filter/filter-input.c 2001/09/04 16:51:29 -@@ -23,6 +23,7 @@ - #endif - - #include <string.h> -+#include <sys/types.h> - #include <regex.h> - #include <gtk/gtkobject.h> - #include <gtk/gtkwidget.h> diff --git a/mail/evolution-devel/files/patch-po::Makefile.in.in b/mail/evolution-devel/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..f2ce380397ca --- /dev/null +++ b/mail/evolution-devel/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/09/11 17:20:57 1.1 ++++ po/Makefile.in.in 2001/09/11 17:21:24 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c deleted file mode 100644 index f32c70d82e3d..000000000000 --- a/mail/evolution-devel/files/patch-shell::e-shortcuts-view-model.c +++ /dev/null @@ -1,140 +0,0 @@ - -$FreeBSD$ - ---- shell/e-shortcuts-view-model.c 2001/09/04 16:22:15 1.1 -+++ shell/e-shortcuts-view-model.c 2001/09/04 16:30:50 -@@ -45,31 +45,71 @@ - }; - - -+/* Utility functions. */ -+ -+static GdkPixbuf * -+get_icon_for_item (EShortcutsViewModel *shortcuts_view_model, -+ const EShortcutItem *item, -+ gboolean want_mini) -+{ -+ EShortcutsViewModelPrivate *priv; -+ -+ priv = shortcuts_view_model->priv; -+ -+ if (item->type != NULL) { -+ EStorageSet *storage_set; -+ EFolderTypeRegistry *folder_type_registry; -+ -+ storage_set = e_shortcuts_get_storage_set (priv->shortcuts); -+ folder_type_registry = e_storage_set_get_folder_type_registry (storage_set); -+ -+ return e_folder_type_registry_get_icon_for_type (folder_type_registry, -+ item->type, -+ want_mini); -+ } -+ -+ g_print ("(%s is not a folder!)\n", item->name); -+ -+ return NULL; -+} -+ -+ - /* View initialization. */ - -+static char * -+get_name_with_unread (const EShortcutItem *item) -+{ -+ return g_strdup (item->name); -+} -+ - static void - load_group_into_model (EShortcutsViewModel *shortcuts_view_model, - int group_num) - { - EShortcutsViewModelPrivate *priv; -- EStorageSet *storage_set; - const GSList *shortcut_list; - const GSList *p; - - priv = shortcuts_view_model->priv; - -- storage_set = e_shortcuts_get_storage_set (priv->shortcuts); -- g_assert (storage_set != NULL); -- - shortcut_list = e_shortcuts_get_shortcuts_in_group (priv->shortcuts, group_num); - if (shortcut_list == NULL) - return; - - for (p = shortcut_list; p != NULL; p = p->next) { - const EShortcutItem *item; -+ char *name_with_unread; - - item = (const EShortcutItem *) p->data; -- e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), group_num, -1, item->uri, item->name); -+ name_with_unread = get_name_with_unread (item); -+ -+ e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), -+ group_num, -1, -+ item->uri, -+ name_with_unread, -+ get_icon_for_item (shortcuts_view_model, item, FALSE)); -+ -+ g_free (name_with_unread); - } - } - -@@ -153,6 +193,7 @@ - EShortcutsViewModel *shortcuts_view_model; - EShortcutsViewModelPrivate *priv; - const EShortcutItem *shortcut_item; -+ char *name_with_unread; - - shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data); - priv = shortcuts_view_model->priv; -@@ -160,10 +201,14 @@ - shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num); - g_assert (shortcut_item != NULL); - -+ name_with_unread = get_name_with_unread (shortcut_item); - e_shortcut_model_add_item (E_SHORTCUT_MODEL (shortcuts_view_model), - group_num, item_num, - shortcut_item->uri, -- shortcut_item->name); -+ name_with_unread, -+ get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE)); -+ -+ g_free (name_with_unread); - } - - static void -@@ -187,6 +232,7 @@ - EShortcutsViewModel *shortcuts_view_model; - EShortcutsViewModelPrivate *priv; - const EShortcutItem *shortcut_item; -+ char *name_with_unread; - - shortcuts_view_model = E_SHORTCUTS_VIEW_MODEL (data); - priv = shortcuts_view_model->priv; -@@ -194,10 +240,14 @@ - shortcut_item = e_shortcuts_get_shortcut (priv->shortcuts, group_num, item_num); - g_assert (shortcut_item != NULL); - -+ name_with_unread = get_name_with_unread (shortcut_item); - e_shortcut_model_update_item (E_SHORTCUT_MODEL (shortcuts_view_model), - group_num, item_num, - shortcut_item->uri, -- shortcut_item->name); -+ name_with_unread, -+ get_icon_for_item (shortcuts_view_model, shortcut_item, FALSE)); -+ -+ g_free (name_with_unread); - } - - -@@ -213,6 +263,9 @@ - priv = view_model->priv; - - g_free (priv); -+ -+ if (GTK_OBJECT_CLASS (parent_class)->destroy) -+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); - } - - diff --git a/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c b/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c deleted file mode 100644 index 2ff7af4ec1b9..000000000000 --- a/mail/evolution-devel/files/patch-shell::e-shortcuts-view.c +++ /dev/null @@ -1,63 +0,0 @@ - -$FreeBSD$ - ---- shell/e-shortcuts-view.c 2001/09/04 16:40:47 1.1 -+++ shell/e-shortcuts-view.c 2001/09/04 16:44:17 -@@ -86,47 +86,6 @@ - return colon + 1; - } - --/* Icon callback for the shortcut bar. */ --static GdkPixbuf * --icon_callback (EShortcutBar *shortcut_bar, -- const char *uri, -- gpointer data) --{ -- EFolderTypeRegistry *folder_type_registry; -- EShortcuts *shortcuts; -- EStorageSet *storage_set; -- EFolder *folder; -- GdkPixbuf *pixbuf; -- const char *type; -- -- shortcuts = E_SHORTCUTS (data); -- -- storage_set = e_shortcuts_get_storage_set (shortcuts); -- folder_type_registry = e_storage_set_get_folder_type_registry (storage_set); -- -- if (strcmp ("evolution:/My Evolution", uri) == 0) { -- type = "My Evolution"; -- } else { -- folder = e_storage_set_get_folder (storage_set, -- get_storage_set_path_from_uri (uri)); -- -- if (folder == NULL) -- return NULL; -- -- type = e_folder_get_type_string (folder); -- if (type == NULL) -- return NULL; -- } -- -- /* FIXME mini icons? */ -- pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, FALSE); -- -- if (pixbuf != NULL) -- gdk_pixbuf_ref (pixbuf); -- -- return pixbuf; --} -- - - static void - show_new_group_dialog (EShortcutsView *view) -@@ -659,9 +618,6 @@ - - priv->shortcuts = shortcuts; - gtk_object_ref (GTK_OBJECT (priv->shortcuts)); -- -- e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcuts_view), icon_callback, -- shortcuts); - - e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view), - E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts))); |