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