On Tue, Feb 10, 2004 at 08:03:41PM +0100, Marcin Rachwał wrote:
> Dnia Mon, 09 Feb 2004 23:54:57 +0100
> Marcin Krzyzanowski <[EMAIL PROTECTED]> zeznał:
>
>
> > jak ci sie chce to podeslij pacza tak jak to powinno dzialac z HOME_ETC
> > bo to bylo na szybko zaimplementowane, zdaje sie ze nie zrozumialem
> > roznicy pomiedzy CONFIG_DIR i HOME_ETC
>
> Może się okazać, że za krótki jestem. W każdym razie, dopiero w weekend
> będę mógł powalczyć. A co do CONFIG_DIR i HOME_ETC to chyba, do licha to
> samo, chyba że ja też nie rozumiem.
Sorry, że Cię uprzedziłem. HOME_ETC zastępuje HOME, a CONFIG_DIR jest tylko
do HOME dodatkiem. Wyciąłem CONFIG_DIR. Unifikacja standardów.
--
Witold Filipczyk tohu-bohu
<[EMAIL PROTECTED]>
diff -Nru gg2-2.0pre6.orig/src/plugins/docklet/dockapp/dockapp_plugin.c
gg2-2.0pre6/src/plugins/docklet/dockapp/dockapp_plugin.c
--- gg2-2.0pre6.orig/src/plugins/docklet/dockapp/dockapp_plugin.c 2004-01-12
20:16:34.000000000 +0100
+++ gg2-2.0pre6/src/plugins/docklet/dockapp/dockapp_plugin.c 2004-02-11
08:22:24.000000000 +0100
@@ -589,11 +589,8 @@
ggadu_config_var_add(handler, "dockapp_protocol", VAR_STR);
ggadu_config_var_add(handler, "dockapp_visible", VAR_BOOL);
- if (g_getenv("CONFIG_DIR") || g_getenv("HOME_ETC"))
- this_configdir =
- g_build_filename(g_get_home_dir(),
- g_getenv("CONFIG_DIR") ? g_getenv("CONFIG_DIR") : g_getenv("HOME_ETC"),
- "gg", NULL);
+ if (g_getenv("HOME_ETC"))
+ this_configdir = g_build_filename(g_getenv("HOME_ETC"), ".gg", NULL);
else
this_configdir = g_build_filename(g_get_home_dir(), ".gg", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/gadu_gadu/gadu_gadu_plugin.c
gg2-2.0pre6/src/plugins/gadu_gadu/gadu_gadu_plugin.c
--- gg2-2.0pre6.orig/src/plugins/gadu_gadu/gadu_gadu_plugin.c 2004-01-14
21:05:56.000000000 +0100
+++ gg2-2.0pre6/src/plugins/gadu_gadu/gadu_gadu_plugin.c 2004-02-11
08:20:15.000000000 +0100
@@ -1461,11 +1461,8 @@
ggadu_config_var_add(handler, "dcc", VAR_BOOL);
- if (g_getenv("CONFIG_DIR") || g_getenv("HOME_ETC"))
- this_configdir =
- g_build_filename(g_get_home_dir(),
- g_getenv("CONFIG_DIR") ?
g_getenv("CONFIG_DIR") : g_getenv("HOME_ETC"), "gg",
- NULL);
+ if (g_getenv("HOME_ETC"))
+ this_configdir = g_build_filename(g_getenv("HOME_ETC"), ".gg", NULL);
else
this_configdir = g_build_filename(g_get_home_dir(), ".gg", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/GUI/gui_main.c
gg2-2.0pre6/src/plugins/GUI/gui_main.c
--- gg2-2.0pre6.orig/src/plugins/GUI/gui_main.c 2004-01-14 19:12:15.000000000 +0100
+++ gg2-2.0pre6/src/plugins/GUI/gui_main.c 2004-02-11 08:18:50.000000000 +0100
@@ -87,8 +87,8 @@
register_signal_receiver((GGaduPlugin *)gui_handler,
(signal_func_ptr)gui_signal_receive);
- if (g_getenv("CONFIG_DIR") || g_getenv ("HOME_ETC") )
- this_configdir = g_build_filename(g_get_home_dir(),g_getenv("CONFIG_DIR") ?
g_getenv("CONFIG_DIR") : g_getenv ("HOME_ETC"),"gg2",NULL);
+ if (g_getenv ("HOME_ETC") )
+ this_configdir = g_build_filename(g_getenv ("HOME_ETC"),".gg2",NULL);
else
this_configdir = g_build_filename(g_get_home_dir(),".gg2",NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/remote/remote_plugin.c
gg2-2.0pre6/src/plugins/remote/remote_plugin.c
--- gg2-2.0pre6.orig/src/plugins/remote/remote_plugin.c 2003-12-21 00:17:21.000000000
+0100
+++ gg2-2.0pre6/src/plugins/remote/remote_plugin.c 2004-02-11 08:24:34.000000000
+0100
@@ -675,8 +675,8 @@
_("Remote control"));
- if (g_getenv ("CONFIG_DIR") || g_getenv ("HOME_ETC"))
- this_configdir = g_build_filename (g_get_home_dir (), g_getenv ("CONFIG_DIR")
? g_getenv ("CONFIG_DIR") : g_getenv ("HOME_ETC"), "gg2", NULL);
+ if (g_getenv ("HOME_ETC"))
+ this_configdir = g_build_filename (g_getenv ("HOME_ETC"), ".gg2", NULL);
else
this_configdir = g_build_filename (g_get_home_dir (), ".gg2", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/sms/sms_gui.c
gg2-2.0pre6/src/plugins/sms/sms_gui.c
--- gg2-2.0pre6.orig/src/plugins/sms/sms_gui.c 2004-01-09 23:43:43.000000000 +0100
+++ gg2-2.0pre6/src/plugins/sms/sms_gui.c 2004-02-11 08:23:56.000000000 +0100
@@ -173,8 +173,8 @@
print_debug("%s : read configuration\n", GGadu_PLUGIN_NAME);
- if (g_getenv ("CONFIG_DIR") || g_getenv ("HOME_ETC"))
- this_configdir = g_build_filename (g_get_home_dir (), g_getenv ("CONFIG_DIR")
? g_getenv ("CONFIG_DIR") : g_getenv ("HOME_ETC"), "gg2", NULL);
+ if (g_getenv ("HOME_ETC"))
+ this_configdir = g_build_filename (g_getenv ("HOME_ETC"), ".gg2", NULL);
else
this_configdir = g_build_filename (g_get_home_dir (), ".gg2", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/sound/external/plugin_sound_external.c
gg2-2.0pre6/src/plugins/sound/external/plugin_sound_external.c
--- gg2-2.0pre6.orig/src/plugins/sound/external/plugin_sound_external.c 2004-01-12
01:00:48.000000000 +0100
+++ gg2-2.0pre6/src/plugins/sound/external/plugin_sound_external.c 2004-02-11
08:23:14.000000000 +0100
@@ -118,8 +118,8 @@
register_signal(handler,"sound play file");
register_signal(handler,"update config");
- if (g_getenv ("CONFIG_DIR") || g_getenv ("HOME_ETC"))
- this_configdir = g_build_filename (g_get_home_dir (), g_getenv ("CONFIG_DIR")
? g_getenv ("CONFIG_DIR") : g_getenv ("HOME_ETC"), "gg2", NULL);
+ if (g_getenv ("HOME_ETC"))
+ this_configdir = g_build_filename (g_getenv ("HOME_ETC"), ".gg2", NULL);
else
this_configdir = g_build_filename (g_get_home_dir (), ".gg2", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/update/update_plugin.c
gg2-2.0pre6/src/plugins/update/update_plugin.c
--- gg2-2.0pre6.orig/src/plugins/update/update_plugin.c 2004-01-13 18:48:40.000000000
+0100
+++ gg2-2.0pre6/src/plugins/update/update_plugin.c 2004-02-11 08:25:27.000000000
+0100
@@ -405,8 +405,8 @@
update_handler = (GGaduPlugin *) register_plugin(GGadu_PLUGIN_NAME, _("Update
checker"));
print_debug("%s : read configuration\n", GGadu_PLUGIN_NAME);
- if (g_getenv ("CONFIG_DIR") || g_getenv ("HOME_ETC"))
- this_configdir = g_build_filename (g_get_home_dir (), g_getenv ("CONFIG_DIR")
? g_getenv ("CONFIG_DIR") : g_getenv ("HOME_ETC"), "gg2", NULL);
+ if (g_getenv ("HOME_ETC"))
+ this_configdir = g_build_filename (g_getenv ("HOME_ETC"), ".gg2", NULL);
else
this_configdir = g_build_filename (g_get_home_dir (), ".gg2", NULL);
diff -Nru gg2-2.0pre6.orig/src/plugins/xosd/plugin_xosd.c
gg2-2.0pre6/src/plugins/xosd/plugin_xosd.c
--- gg2-2.0pre6.orig/src/plugins/xosd/plugin_xosd.c 2003-12-21 00:17:23.000000000
+0100
+++ gg2-2.0pre6/src/plugins/xosd/plugin_xosd.c 2004-02-11 08:21:06.000000000 +0100
@@ -493,8 +493,8 @@
ggadu_config_var_add(handler, "pos", VAR_STR);
ggadu_config_var_add(handler, "numlines", VAR_INT);
- if (g_getenv ("CONFIG_DIR") || g_getenv ("HOME_ETC"))
- this_configdir = g_build_filename (g_get_home_dir (), g_getenv ("CONFIG_DIR")
? g_getenv ("CONFIG_DIR") : g_getenv ("HOME_ETC"), "gg2", NULL);
+ if (g_getenv ("HOME_ETC"))
+ this_configdir = g_build_filename (g_getenv ("HOME_ETC"), ".gg2", NULL);
else
this_configdir = g_build_filename (g_get_home_dir (), ".gg2", NULL);
__________________________________________________________
nie pytaj co inni zrobili dla pld, pomysl ile sam zrobiles
