comparison libpurple/util.c @ 20091:2ab6b55ffa3d

Rename the internal home_dir variable to user_dir to match the function and the custom_user_dir variable. Additionally, this will avoid confusion with the purple_home_dir() function, which did not use the home_dir variable, as that variable stored the user_dir.
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:59:11 +0000
parents 6bf32c9e15a7
children a9022965162b
comparison
equal deleted inserted replaced
20090:e638dec3d76b 20091:2ab6b55ffa3d
66 unsigned long len; 66 unsigned long len;
67 unsigned long data_len; 67 unsigned long data_len;
68 }; 68 };
69 69
70 static char *custom_user_dir = NULL; 70 static char *custom_user_dir = NULL;
71 static char *home_dir = NULL; 71 static char *user_dir = NULL;
72 72
73 PurpleMenuAction * 73 PurpleMenuAction *
74 purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data, 74 purple_menu_action_new(const char *label, PurpleCallback callback, gpointer data,
75 GList *children) 75 GList *children)
76 { 76 {
2462 const char * 2462 const char *
2463 purple_user_dir(void) 2463 purple_user_dir(void)
2464 { 2464 {
2465 if (custom_user_dir != NULL) 2465 if (custom_user_dir != NULL)
2466 return custom_user_dir; 2466 return custom_user_dir;
2467 else if (!home_dir) 2467 else if (!user_dir)
2468 home_dir = g_build_filename(purple_home_dir(), ".purple", NULL); 2468 user_dir = g_build_filename(purple_home_dir(), ".purple", NULL);
2469 2469
2470 return home_dir; 2470 return user_dir;
2471 } 2471 }
2472 2472
2473 void purple_util_set_user_dir(const char *dir) 2473 void purple_util_set_user_dir(const char *dir)
2474 { 2474 {
2475 g_free(custom_user_dir); 2475 g_free(custom_user_dir);