galeon-home_etc.patch

   1 diff -Nru galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c
   2 --- galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c     2002-12-15 21:24:08.000000000 +0100
   3 +++ galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c  2003-11-13 12:26:57.000000000 +0100
   4 @@ -134,6 +134,7 @@
   5         GSList *ret = NULL;
   6         gchar *dir;
   7         gchar *fname;
   8 +       gchar *home_etc = getenv("HOME_ETC");
   9         guint i;
  10
  11         static const gchar *galeon_dirs[] = { ".galeon", ".galeon1" , ".galeon2" };
  12 @@ -143,7 +144,7 @@
  13         for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
  14         {
  15                 uint j;
  16 -               dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
  17 +               dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), galeon_dirs[i], NULL);
  18                 l = gul_find_file  (dir, "bookmarks.xbel", 5);
  19                 ret = g_slist_concat (ret, l);
  20                 for (j = 0; j < 10; ++j)
  21 diff -Nru galeon-1.3.10.orig/bookmarks/testbookmarks.c galeon-1.3.10/bookmarks/testbookmarks.c
  22 --- galeon-1.3.10.orig/bookmarks/testbookmarks.c        2002-07-23 14:06:55.000000000 +0200
  23 +++ galeon-1.3.10/bookmarks/testbookmarks.c     2003-11-13 12:26:57.000000000 +0100
  24 @@ -132,8 +132,9 @@
  25  int
  26  main (int argc, char *argv[])
  27  {
  28 +       gchar *home_etc = getenv("HOME_ETC");
  29         gchar *filename = argc == 2 ? argv[1]
  30 -               : g_strconcat (g_get_home_dir (),
  31 +               : g_strconcat (home_etc ? home_etc : g_get_home_dir (),
  32                                "/.galeon/bookmarks.xbel", NULL);
  33         GbBookmarkSet *set;
  34         GbFolder *folder1, *folder2, *r;
  35 diff -Nru galeon-1.3.10.orig/embed/global-history.c galeon-1.3.10/embed/global-history.c
  36 --- galeon-1.3.10.orig/embed/global-history.c   2003-09-19 07:00:23.000000000 +0200
  37 +++ galeon-1.3.10/embed/global-history.c        2003-11-13 12:34:52.000000000 +0100
  38 @@ -389,6 +389,7 @@
  39  static void
  40  history_load (GlobalHistory *gh)
  41  {
  42 +       gchar *home_etc = getenv("HOME_ETC");
  43          /* definition of SAX parser for reading documents */
  44         static xmlSAXHandler parser =
  45         {
  46 @@ -421,7 +422,7 @@
  47          gchar *histfile;
  48
  49         /* build the filename */
  50 -        confdir = g_build_filename (g_get_home_dir (), GALEON_DIR, NULL);
  51 +        confdir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, NULL);
  52         histfile = g_build_filename (confdir, "history.xml", NULL);
  53
  54         /* build the initial history hash table */
  55 @@ -526,7 +527,8 @@
  56  static void
  57  history_save (GlobalHistoryPrivate *ghpriv)
  58  {
  59 -        gchar *histfile;
  60 +       gchar *histfile;
  61 +       gchar *home_etc = getenv("HOME_ETC");
  62         FILE *fp;
  63
  64         DEBUG_MSG (("saving history\n"));
  65 @@ -538,7 +540,7 @@
  66
  67         DEBUG_MSG (("really\n"));
  68
  69 -       histfile = g_strconcat (g_get_home_dir (),
  70 +       histfile = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
  71                                 "/"GALEON_DIR"/history.xml", NULL);
  72         fp = fopen (histfile, "wb");
  73         g_free (histfile);
  74 diff -Nru galeon-1.3.10.orig/galeon-config-tool.in galeon-1.3.10/galeon-config-tool.in
  75 --- galeon-1.3.10.orig/galeon-config-tool.in    2002-03-14 08:40:24.000000000 +0100
  76 +++ galeon-1.3.10/galeon-config-tool.in 2003-11-13 12:26:57.000000000 +0100
  77 @@ -44,6 +44,21 @@
  78                     echo "Removing $HOME/.gnome/accels/galeon"
  79                     rm -rf $HOME/.gnome/accels/galeon
  80
  81 +                               if [ -n "$HOME_ETC" ]; then
  82 +                       echo "Removing $HOME_ETC/.galeon"
  83 +                               rm -rf $HOME_ETC/.galeon
  84 +
  85 +                       echo "Removing $HOME_ETC/.gconf/apps/galeon"
  86 +                       rm -rf $HOME_ETC/.gconf/apps/galeon
  87 +
  88 +                       echo "Removing $HOME_ETC/.gnome/galeon"
  89 +                       rm -rf $HOME_ETC/.gnome/galeon
  90 +
  91 +                       echo "Removing $HOME_ETC/.gnome/accels/galeon"
  92 +                       rm -rf $HOME_ETC/.gnome/accels/galeon
  93 +
  94 +                               fi
  95 +
  96                     echo "...Done."
  97
  98             else
  99 diff -Nru galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp galeon-1.3.10/mozilla/mozilla-embed-shell.cpp
 100 --- galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp  2003-09-25 05:36:35.000000000 +0200
 101 +++ galeon-1.3.10/mozilla/mozilla-embed-shell.cpp       2003-11-13 12:39:02.000000000 +0100
 102 @@ -331,7 +331,8 @@
 103  mozilla_init_profile (void)
 104  {
 105         char *profile_path;
 106 -       profile_path = g_build_filename (g_get_home_dir (),
 107 +       char *home_etc = getenv("HOME_ETC");
 108 +       profile_path = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 109                                          MOZILLA_PROFILE_DIR,
 110                                          NULL);
 111          gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
 112 diff -Nru galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp
 113 --- galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp      2003-09-15 02:48:24.000000000 +0200
 114 +++ galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp   2003-11-13 12:26:57.000000000 +0100
 115 @@ -198,13 +198,14 @@
 116  NS_METHOD GMyportalProtocolHandler::CreateMyportalPage (const nsACString &path, nsIURI *aURI, nsIChannel **aChannel)
 117  {
 118         nsresult rv;
 119 +       char *home_etc = getenv("HOME_ETC");
 120
 121         /* check bookmarks are loaded */
 122         //      g_return_val_if_fail (bookmarks_root != NULL,NS_ERROR_FAILURE);
 123
 124         /* open the rendering stream */
 125  #if USE_INTERMEDIATE_FILE
 126 -       gchar *filename = g_strconcat (g_get_home_dir (),
 127 +       gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
 128                                        "/.galeon/myportal.html",
 129                                        NULL);
 130         gchar *myportalURI = g_strconcat ("file://",filename, NULL);
 131 diff -Nru galeon-1.3.10.orig/mozilla/SideBar.cpp galeon-1.3.10/mozilla/SideBar.cpp
 132 --- galeon-1.3.10.orig/mozilla/SideBar.cpp      2003-09-15 02:56:54.000000000 +0200
 133 +++ galeon-1.3.10/mozilla/SideBar.cpp   2003-11-13 12:36:30.000000000 +0100
 134 @@ -255,7 +255,8 @@
 135
 136  void GSidebar::LoadSidebarPages(void)
 137  {
 138 -       gchar *filename = g_build_filename(g_get_home_dir(),
 139 +       gchar *home_etc = getenv("HOME_ETC");
 140 +       gchar *filename = g_build_filename(home_etc ? home_etc : g_get_home_dir(),
 141                                            GALEON_DIR"/sidebars.xml",
 142                                            NULL);
 143
 144 @@ -299,7 +300,8 @@
 145
 146  void GSidebar::SaveSidebarPages(void)
 147  {
 148 -       gchar *filename = g_build_filename (g_get_home_dir(),
 149 +       gchar *home_etc = getenv("HOME_ETC");
 150 +       gchar *filename = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
 151                                             GALEON_DIR"/sidebars.xml",
 152                                             NULL);
 153
 154 diff -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon-favicon-cache.c
 155 --- galeon-1.3.10.orig/src/galeon-favicon-cache.c       2003-09-05 03:01:53.000000000 +0200
 156 +++ galeon-1.3.10/src/galeon-favicon-cache.c    2003-11-13 12:26:57.000000000 +0100
 157 @@ -114,6 +114,8 @@
 158  static void
 159  galeon_favicon_cache_init (GaleonFaviconCache *cache)
 160  {
 161 +       gchar *home_etc = getenv("HOME_ETC");
 162 +
 163         cache->priv = g_new0 (GaleonFaviconCachePrivate, 1);
 164
 165         cache->priv->url_to_pixbuf     = g_hash_table_new_full (g_str_hash,
 166 @@ -125,11 +127,11 @@
 167                                                                 (GDestroyNotify) g_free,
 168                                                                 (GDestroyNotify) g_object_unref);
 169
 170 -       cache->priv->filename  = g_build_filename (g_get_home_dir (),
 171 +       cache->priv->filename  = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 172                                                    GALEON_DIR,
 173                                                    "favicon_cache.xml",
 174                                                    NULL);
 175 -       cache->priv->directory = g_build_filename (g_get_home_dir (),
 176 +       cache->priv->directory = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 177                                                    GALEON_DIR,
 178                                                    "favicon_cache/",
 179                                                    NULL);
 180 diff -Nru galeon-1.3.10.orig/src/galeon-shell.c galeon-1.3.10/src/galeon-shell.c
 181 --- galeon-1.3.10.orig/src/galeon-shell.c       2003-10-13 23:56:13.000000000 +0200
 182 +++ galeon-1.3.10/src/galeon-shell.c    2003-11-13 12:26:57.000000000 +0100
 183 @@ -660,7 +660,8 @@
 184  {
 185         /* this is temp code, I need to think about how to properly initialize bookmarks */
 186         GbXBEL *io = gb_xbel_new ();
 187 -       gchar *filename = g_strconcat (g_get_home_dir (), "/",
 188 +       gchar *home_etc = getenv("HOME_ETC");
 189 +       gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (), "/",
 190                                        GALEON_DIR "/bookmarks.xbel", NULL);
 191
 192         /* init the bookmark icon provider */
 193 diff -Nru galeon-1.3.10.orig/src/galeon-spinner.c galeon-1.3.10/src/galeon-spinner.c
 194 --- galeon-1.3.10.orig/src/galeon-spinner.c     2003-09-09 01:26:56.000000000 +0200
 195 +++ galeon-1.3.10/src/galeon-spinner.c  2003-11-13 12:26:57.000000000 +0100
 196 @@ -827,8 +827,9 @@
 197  galeon_spinner_init_directory_list (void)
 198  {
 199         gchar *path;
 200 +       gchar *home_etc = getenv("HOME_ETC");
 201
 202 -       path = g_build_filename (g_get_home_dir (), GALEON_DIR, "spinners", NULL);
 203 +       path = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, "spinners", NULL);
 204         spinner_directories = g_list_append (spinner_directories, path);
 205
 206         path = g_build_filename (SHARE_DIR, "spinners", NULL);
 207 diff -Nru galeon-1.3.10.orig/src/session.c galeon-1.3.10/src/session.c
 208 --- galeon-1.3.10.orig/src/session.c    2003-10-22 17:25:06.000000000 +0200
 209 +++ galeon-1.3.10/src/session.c 2003-11-13 12:26:57.000000000 +0100
 210 @@ -160,19 +160,20 @@
 211  get_session_filename (const char *filename)
 212  {
 213         char *save_to;
 214 +       char *home_etc = getenv("HOME_ETC");
 215
 216         g_return_val_if_fail (filename != NULL, NULL);
 217
 218         if (strcmp (filename, SESSION_SAVED) == 0)
 219         {
 220 -               save_to = g_build_filename (g_get_home_dir (),
 221 +               save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 222                                             GALEON_DIR,
 223                                             "session_saved.xml",
 224                                             NULL);
 225         }
 226         else if (strcmp (filename, SESSION_CRASHED) == 0)
 227         {
 228 -               save_to = g_build_filename (g_get_home_dir (),
 229 +               save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 230                                             GALEON_DIR,
 231                                             "session_crashed.xml",
 232                                             NULL);
 233 @@ -181,7 +182,7 @@
 234         {
 235                 char *tmp;
 236
 237 -               save_to = g_build_filename (g_get_home_dir (),
 238 +               save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
 239                                             GALEON_DIR,
 240                                             "session_gnome-XXXXXX",
 241                                             NULL);
 242 diff -Nru galeon-1.3.10.orig/utils/gul-general.c galeon-1.3.10/utils/gul-general.c
 243 --- galeon-1.3.10.orig/utils/gul-general.c      2003-09-08 20:51:28.000000000 +0200
 244 +++ galeon-1.3.10/utils/gul-general.c   2003-11-13 12:31:43.000000000 +0100
 245 @@ -75,6 +75,7 @@
 246         static GHashTable *already_found = NULL;
 247         gchar *alternative[6];
 248         gchar *file;
 249 +       gchar *home_etc = getenv("HOME_ETC");
 250         gint i;
 251
 252         /* create cache hash table if it doesnt already exist */
 253 @@ -99,7 +100,7 @@
 254         }
 255
 256         /* try the default */
 257 -       file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
 258 +       file = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, fname, NULL);
 259
 260         /* success? */
 261         if (g_file_test (file, G_FILE_TEST_EXISTS))
 262 diff -Nru galeon-1.3.10.orig/utils/gul-state.c galeon-1.3.10/utils/gul-state.c
 263 --- galeon-1.3.10.orig/utils/gul-state.c        2003-08-30 15:50:36.000000000 +0200
 264 +++ galeon-1.3.10/utils/gul-state.c     2003-11-13 12:26:57.000000000 +0100
 265 @@ -38,9 +38,10 @@
 266  {
 267         char *state_file;
 268         char *config_prefix;
 269 +       char *home_etc = getenv("HOME_ETC");
 270
 271         /* Using ~/.galeon/state.ini to keep all files together. */
 272 -       state_file = g_build_filename (g_get_home_dir(),
 273 +       state_file = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
 274                                        ".galeon", "state.ini", NULL);
 275
 276         config_prefix = g_strconcat ("=", state_file, "=/", NULL);