From: Jan Wideł Date: Sun, 11 Apr 2010 20:32:36 +0000 (+0000) Subject: - remove unnecessary patch X-Git-Tag: auto/ti/bluefish-2_0_0-2~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluefish.git;a=commitdiff_plain;h=4d005b91872ca50edc78927f4a6f7d571812cd73 - remove unnecessary patch Changed files: bluefish-home_etc.patch -> 1.3 --- diff --git a/bluefish-home_etc.patch b/bluefish-home_etc.patch deleted file mode 100644 index e66f4af..0000000 --- a/bluefish-home_etc.patch +++ /dev/null @@ -1,173 +0,0 @@ -diff -urN bluefish-1.0.7/src/bluefish.c bluefish-1.0.7.new/src/bluefish.c ---- bluefish-1.0.7/src/bluefish.c 2006-02-10 14:24:35.000000000 +0100 -+++ bluefish-1.0.7.new/src/bluefish.c 2007-02-07 12:41:03.000000000 +0100 -@@ -186,7 +186,7 @@ - #endif /* #ifndef NOSPLASH */ - - { -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/dir_history", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/dir_history", NULL); - main_v->recent_directories = get_stringlist(filename, NULL); - g_free(filename); - } -@@ -230,7 +230,7 @@ - gchar *shortcutfilename; - GtkSettings* gtksettings = gtk_settings_get_default(); - g_object_set(G_OBJECT(gtksettings), "gtk-can-change-accels", TRUE, NULL); -- shortcutfilename = g_strconcat(g_get_home_dir(), "/.bluefish/menudump_2", NULL); -+ shortcutfilename = g_strconcat(_HEdir, "/.bluefish/menudump_2", NULL); - gtk_accel_map_load(shortcutfilename); - g_free(shortcutfilename); - } -@@ -347,7 +347,7 @@ - - rcfile_save_all(); - { -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/dir_history", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/dir_history", NULL); - put_stringlist_limited(filename, main_v->recent_directories, main_v->props.max_dir_history); - g_free(filename); - } -diff -urN bluefish-1.0.7/src/bluefish.h bluefish-1.0.7.new/src/bluefish.h ---- bluefish-1.0.7/src/bluefish.h 2006-01-18 10:18:08.000000000 +0100 -+++ bluefish-1.0.7.new/src/bluefish.h 2007-02-07 12:40:12.000000000 +0100 -@@ -72,6 +72,7 @@ - #include - #endif - -+#include - - /*********************/ - /* undo/redo structs */ -diff -urN bluefish-1.0.7/src/fref.c bluefish-1.0.7.new/src/fref.c ---- bluefish-1.0.7/src/fref.c 2006-08-22 06:06:56.000000000 +0200 -+++ bluefish-1.0.7.new/src/fref.c 2007-02-07 12:47:57.000000000 +0100 -@@ -1814,7 +1814,7 @@ - - static void fref_popup_menu_rescan_lcb(GtkWidget * widget, gpointer user_data) - { -- gchar *userdir = g_strconcat(g_get_home_dir(), "/.bluefish/", NULL); -+ gchar *userdir = g_strconcat(_HEdir, "/.bluefish/", NULL); - DEBUG_MSG("fref_popup_menu_rescan_lcb, started\n"); - fref_rescan_dir(PKGDATADIR); - fref_rescan_dir(userdir); -diff -urN bluefish-1.0.7/src/Makefile.in bluefish-1.0.7.new/src/Makefile.in ---- bluefish-1.0.7/src/Makefile.in 2006-10-21 18:36:18.000000000 +0200 -+++ bluefish-1.0.7.new/src/Makefile.in 2007-02-07 12:49:57.000000000 +0100 -@@ -36,7 +36,7 @@ - CC = @CC@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lhome_etc - INSTALL = @INSTALL@ - INSTALL_DIR = $(INSTALL) -d -m 755 - INSTALL_PROGRAM = $(INSTALL) -s -m 755 -diff -urN bluefish-1.0.7/src/rcfile.c bluefish-1.0.7.new/src/rcfile.c ---- bluefish-1.0.7/src/rcfile.c 2006-10-08 17:51:07.000000000 +0200 -+++ bluefish-1.0.7.new/src/rcfile.c 2007-02-07 12:52:19.000000000 +0100 -@@ -491,7 +491,7 @@ - /*Make the config_rc list ready for filling with data and set default values */ - main_configlist = props_init_main(NULL); - -- filename = g_strconcat(g_get_home_dir(), "/.bluefish/rcfile_v2", NULL); -+ filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL); - if (!parse_config_file(main_configlist, filename)) { - /* should we initialize some things ?? */ - } -@@ -582,7 +582,7 @@ - main_v->props.filefilters = g_list_append(main_v->props.filefilters, arr); - } - if (main_v->props.reference_files == NULL) { -- gchar *userdir = g_strconcat(g_get_home_dir(), "/.bluefish/", NULL); -+ gchar *userdir = g_strconcat(_HEdir, "/.bluefish/", NULL); - /* if the user does not yet have any function reference files, set them to default values */ - fref_rescan_dir(PKGDATADIR); - fref_rescan_dir(userdir); -@@ -616,7 +616,7 @@ - } - - static gint rcfile_save_main(void) { -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/rcfile_v2", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL); - return save_config_file(main_configlist, filename); - } - /* -@@ -640,7 +640,7 @@ - highlighting_configlist = NULL; - init_prop_arraylist(&highlighting_configlist, &main_v->props.highlight_patterns, "patterns:", 0, TRUE); - -- filename = g_strconcat(g_get_home_dir(), "/.bluefish/highlighting", NULL); -+ filename = g_strconcat(_HEdir, "/.bluefish/highlighting", NULL); - defaultfile = return_first_existing_filename(PKGDATADIR"highlighting.default", - "data/highlighting.default", - "../data/highlighting.default",NULL); -@@ -666,7 +666,7 @@ - - static gint rcfile_save_highlighting(void) { - gint retval; -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/highlighting", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/highlighting", NULL); - retval = save_config_file(highlighting_configlist, filename); - g_free(filename); - return retval; -@@ -694,7 +694,7 @@ - init_prop_arraylist(&custom_menu_configlist, &main_v->props.cmenu_insert, "cmenu_insert:", 0, TRUE); - init_prop_arraylist(&custom_menu_configlist, &main_v->props.cmenu_replace, "cmenu_replace:", 0, TRUE); - -- filename = g_strconcat(g_get_home_dir(), "/.bluefish/custom_menu", NULL); -+ filename = g_strconcat(_HEdir, "/.bluefish/custom_menu", NULL); - - if (full_reset || !parse_config_file(custom_menu_configlist, filename) || (main_v->props.cust_menu==NULL && main_v->props.cmenu_insert==NULL && main_v->props.cmenu_replace==NULL )) { - DEBUG_MSG("error parsing the custom menu file, or full_reset is set\n"); -@@ -815,7 +815,7 @@ - } - static gint rcfile_save_custom_menu(void) { - gint retval; -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/custom_menu", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/custom_menu", NULL); - retval = save_config_file(custom_menu_configlist, filename); - g_free(filename); - return retval; -@@ -823,7 +823,7 @@ - - #define DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) /* same as 0755 */ - void rcfile_check_directory(void) { -- gchar *rcdir = g_strconcat(g_get_home_dir(), "/.bluefish", NULL); -+ gchar *rcdir = g_strconcat(_HEdir, "/.bluefish", NULL); - if (!g_file_test(rcdir, G_FILE_TEST_IS_DIR)) { - mkdir(rcdir, DIR_MODE); - } -@@ -843,7 +843,7 @@ - break; - case 3: - { -- gchar *shortcutfilename = g_strconcat(g_get_home_dir(), "/.bluefish/menudump_2", NULL); -+ gchar *shortcutfilename = g_strconcat(_HEdir, "/.bluefish/menudump_2", NULL); - gtk_accel_map_save(shortcutfilename); - g_free(shortcutfilename); - } -@@ -935,7 +935,7 @@ - - gboolean rcfile_save_global_session(void) { - gboolean retval; -- gchar *filename = g_strconcat(g_get_home_dir(), "/.bluefish/session", NULL); -+ gchar *filename = g_strconcat(_HEdir, "/.bluefish/session", NULL); - GList *configlist = return_globalsession_configlist(FALSE); - configlist = return_session_configlist(configlist, main_v->session); - DEBUG_MSG("rcfile_save_global_session, saving global session to %s\n",filename); -@@ -954,12 +954,12 @@ - gchar *filename; - GList *configlist = return_globalsession_configlist(TRUE); - configlist = return_session_configlist(configlist, main_v->session); -- filename = g_strconcat(g_get_home_dir(), "/.bluefish/session", NULL); -+ filename = g_strconcat(_HEdir, "/.bluefish/session", NULL); - if (!file_exists_and_readable(filename)) { - /* versions before 0.13 did not have a separate session file, so - we'll try to load these items from rcfile_v2 */ - g_free(filename); -- filename = g_strconcat(g_get_home_dir(), "/.bluefish/rcfile_v2", NULL); -+ filename = g_strconcat(_HEdir, "/.bluefish/rcfile_v2", NULL); - } - retval = parse_config_file(configlist, filename); - free_configlist(configlist);