+++ /dev/null
-diff -Nur gg-0.2.2.1.orig/src/callbacks.c gg-0.2.2.1/src/callbacks.c
---- gg-0.2.2.1.orig/src/callbacks.c Wed May 1 10:07:08 2002
-+++ gg-0.2.2.1/src/callbacks.c Wed May 29 13:43:33 2002
-@@ -408,7 +408,7 @@
- gchar *path;
-
- path =
-- g_strdup_printf("%s/.gg/history/%d", getenv("HOME"),
-+ g_strdup_printf("%s/history/%d", config.homedir,
- kontakt->uin);
- fp = fopen(path, "r");
- if (fp) {
-diff -Nur gg-0.2.2.1.orig/src/gg-types.h gg-0.2.2.1/src/gg-types.h
---- gg-0.2.2.1.orig/src/gg-types.h Mon Apr 22 11:59:01 2002
-+++ gg-0.2.2.1/src/gg-types.h Wed May 29 13:34:54 2002
-@@ -61,6 +61,7 @@
- guint save_config_on_exit;
- guint save_contacts_on_exit;
- gchar *server;
-+ gchar *homedir;
- } GGConfig;
-
- typedef struct {
-diff -Nur gg-0.2.2.1.orig/src/gg.c gg-0.2.2.1/src/gg.c
---- gg-0.2.2.1.orig/src/gg.c Fri Apr 19 16:04:50 2002
-+++ gg-0.2.2.1/src/gg.c Wed May 29 13:43:09 2002
-@@ -407,12 +407,12 @@
- gchar *path, *timestamp, *lognick;
- FILE *fp;
-
-- path = g_strdup_printf("%s/.gg/history", getenv("HOME"));
-+ path = g_strdup_printf("%s/history", config.homedir);
- mkdir(path, 0755);
- g_free(path);
-
- path =
-- g_strdup_printf("%s/.gg/history/%d", getenv("HOME"), sess_uin);
-+ g_strdup_printf("%s/history/%d", config.homedir, sess_uin);
- fp = fopen(path, "a");
- g_free(path);
-
-diff -Nur gg-0.2.2.1.orig/src/main.c gg-0.2.2.1/src/main.c
---- gg-0.2.2.1.orig/src/main.c Mon Apr 22 11:59:01 2002
-+++ gg-0.2.2.1/src/main.c Wed May 29 13:39:50 2002
-@@ -80,7 +80,7 @@
- FILE *fp;
- GList *tmplist;
-
-- path = g_strconcat(g_get_home_dir(), "/.gg/userlist", NULL);
-+ path = g_strconcat(config.homedir, "/userlist", NULL);
-
- fp = fopen(path, "w");
-
-@@ -139,7 +139,7 @@
- }
- gtk_clist_clear(GTK_CLIST(lista));
-
-- path = g_strconcat(getenv("HOME"), "/.gg/userlist", NULL);
-+ path = g_strconcat(config.homedir, "/userlist", NULL);
-
- fp = fopen(path, "r");
-
-@@ -271,7 +271,7 @@
- config.save_contacts_on_exit = 1;
- config.server = g_strdup(GG_DEFAULT_HOST);
-
-- path = g_strconcat(getenv("HOME"), "/.gg/config", NULL);
-+ path = g_strconcat(config.homedir, "/config", NULL);
-
- g_list_free(ignore);
-
-@@ -431,7 +431,7 @@
- config.width=window->allocation.width;
- config.height=window->allocation.height;
- }
-- path = g_strconcat(getenv("HOME"), "/.gg/config", NULL);
-+ path = g_strconcat(config.homedir, "/config", NULL);
-
- fp = fopen(path, "w");
-
-@@ -572,12 +572,16 @@
- #ifdef USE_APPLET
- gchar applet_name[] = "gg";
- #endif
-- gchar *path = NULL;
-
-- path = g_strconcat(getenv("HOME"), "/.gg", NULL);
-- mkdir(path, 0755);
-- g_free(path);
-+ config.homedir = NULL;
-+ if (getenv("CONFIG_DIR"))
-+ config.homedir = g_strconcat(getenv("HOME"),"/",
-+ getenv("CONFIG_DIR"), "/gg", NULL);
-+ else
-+ config.homedir = g_strconcat(getenv("HOME"), "/.gg", NULL);
-
-+ mkdir(config.homedir, 0700);
-+
- read_config();
-
- g_set_print_handler((GPrintFunc) my_g_print);
-@@ -649,5 +653,7 @@
- gtk_main();
- #endif
-
-+ g_free(config.homedir);
-+
- return 0;
- }
+++ /dev/null
-diff -Nur gg-0.2.1.orig/src/gg-types.h gg-0.2.1/src/gg-types.h
---- gg-0.2.1.orig/src/gg-types.h Thu Jan 10 00:53:44 2002
-+++ gg-0.2.1/src/gg-types.h Thu Jan 17 17:10:00 2002
-@@ -45,6 +45,8 @@
- gchar *proxy_host;
- guint connect_on_start;
- guint last_sysmsg;
-+ guint width;
-+ guint height;
- } GGConfig;
-
- typedef struct {
-diff -Nur gg-0.2.1.orig/src/gg.h gg-0.2.1/src/gg.h
---- gg-0.2.1.orig/src/gg.h Mon Jan 14 22:43:05 2002
-+++ gg-0.2.1/src/gg.h Thu Jan 17 17:09:25 2002
-@@ -160,6 +160,9 @@
- #define GG_SEARCH 0x0004
- #define GG_REGISTER 0x0005
-
-+#define GG_MIN_WIDTH 160
-+#define GG_MIN_HEIGHT 300
-+
- //unsigned int gg_hash_passwd(unsigned char *passwd, unsigned int seed);
-
- void gg_connect_to_server(void);
-diff -Nur gg-0.2.1.orig/src/interface.c gg-0.2.1/src/interface.c
---- gg-0.2.1.orig/src/interface.c Mon Jan 14 22:49:11 2002
-+++ gg-0.2.1/src/interface.c Thu Jan 17 17:11:24 2002
-@@ -145,7 +145,7 @@
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- #endif
- gtk_object_set_data(GTK_OBJECT(window), "window", window);
-- gtk_widget_set_usize(window, 160, 300);
-+ gtk_widget_set_usize(window, GG_MIN_WIDTH, GG_MIN_HEIGHT);
- gtk_window_set_title(GTK_WINDOW(window), _(TITLE));
-
- #ifdef USE_APPLET
-@@ -452,6 +452,7 @@
- gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
- #endif
- window_set_icon(window, NULL, GG_ONLINE_MAIN);
-+ gtk_window_set_default_size (GTK_WINDOW (window), config.width, config.height);
- return window;
- }
-
-diff -Nur gg-0.2.1.orig/src/main.c gg-0.2.1/src/main.c
---- gg-0.2.1.orig/src/main.c Mon Jan 14 22:52:31 2002
-+++ gg-0.2.1/src/main.c Thu Jan 17 17:14:37 2002
-@@ -259,6 +259,8 @@
- config.proxy_port = 8080;
- config.connect_on_start = 1;
- config.last_sysmsg = 0;
-+ config.width = GG_MIN_WIDTH;
-+ config.height = GG_MIN_HEIGHT;
-
- path = g_strconcat(getenv("HOME"), "/.gg/config", NULL);
-
-@@ -353,6 +355,12 @@
- if (g_strncasecmp(line, "last_sysmsg ", 12) == 0) {
- config.last_sysmsg = atoi(line + 12);
- }
-+ if (g_strncasecmp(line, "width ", 6) == 0) {
-+ config.width = atoi(line + 6);
-+ }
-+ if (g_strncasecmp(line, "height ", 7) == 0) {
-+ config.height = atoi(line + 7);
-+ }
- }
- #ifdef DEBUG
- printf("read_config(): config: %d ********\n", config.uin);
-@@ -366,6 +374,9 @@
- gchar *path;
- GList *tmp_ignore;
-
-+ config.width=window->allocation.width;
-+ config.height=window->allocation.height;
-+
- path = g_strconcat(getenv("HOME"), "/.gg/config", NULL);
-
- fp = fopen(path, "w");
-@@ -407,7 +418,9 @@
-
- fprintf(fp, "connect_on_start %d\n", config.connect_on_start);
- fprintf(fp, "last_sysmsg %d\n", config.last_sysmsg);
--
-+ fprintf(fp, "width %d\n", config.width);
-+ fprintf(fp, "height %d\n", config.height);
-+
- tmp_ignore = ignore;
- while (tmp_ignore) {
- fprintf(fp, "ignore %d\n", *(guint *) tmp_ignore->data);
projects / packages / gg.git / commitdiff