diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-16 22:03:20 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-16 22:18:12 +0800 |
| commit | 0987f756cd0ef59bb4a301197b58340a91469151 (patch) | |
| tree | 4303ef85b07780f0e07cb44d2b1e3e4a1fc8eaac | |
| parent | 8e15abac92213f2c8a37fc985a6625bfc1a70e54 (diff) | |
| download | gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar.gz gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar.bz2 gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar.lz gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar.xz gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.tar.zst gsoc2013-evolution-0987f756cd0ef59bb4a301197b58340a91469151.zip | |
Remove unused e_get_gnome2_user_dir().
| -rw-r--r-- | doc/reference/shell/eshell-sections.txt | 1 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/e-util.sgml | 9 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/eshell-unused.sgml | 8 | ||||
| -rw-r--r-- | e-util/e-util.c | 26 | ||||
| -rw-r--r-- | e-util/e-util.h | 1 |
5 files changed, 8 insertions, 37 deletions
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt index 1e75927cd4..d9d04fba59 100644 --- a/doc/reference/shell/eshell-sections.txt +++ b/doc/reference/shell/eshell-sections.txt @@ -1128,7 +1128,6 @@ EWebViewPrivate <SECTION> <FILE>e-util</FILE> <TITLE>Miscellaneous Utilities</TITLE> -e_get_gnome2_user_dir e_get_accels_filename e_show_uri e_display_help diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml index 060ec3f322..2db95ebccd 100644 --- a/doc/reference/shell/tmpl/e-util.sgml +++ b/doc/reference/shell/tmpl/e-util.sgml @@ -20,15 +20,6 @@ Miscellaneous Utilities <!-- ##### SECTION Image ##### --> -<!-- ##### FUNCTION e_get_gnome2_user_dir ##### --> -<para> - -</para> - -@void: -@Returns: - - <!-- ##### FUNCTION e_get_accels_filename ##### --> <para> diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml index 9ca9911e36..b2beae78bf 100644 --- a/doc/reference/shell/tmpl/eshell-unused.sgml +++ b/doc/reference/shell/tmpl/eshell-unused.sgml @@ -430,6 +430,14 @@ e-shell-window.sgml @binding: +<!-- ##### FUNCTION e_get_gnome2_user_dir ##### --> +<para> + +</para> + +@void: +@Returns: + <!-- ##### FUNCTION e_get_user_data_dir ##### --> <para> diff --git a/e-util/e-util.c b/e-util/e-util.c index 7c203ec7b3..427f479e01 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -59,32 +59,6 @@ #include "e-util-private.h" /** - * e_get_gnome2_user_dir: - * - * Returns the base directory for user data, according to libgnome. - * The directory can be overridden by setting the GNOME22_USER_DIR - * environment variable. The string is owned by Evolution and must - * not be modified or freed. - * - * Returns: base directory for GNOME user data - **/ -const gchar * -e_get_gnome2_user_dir (void) -{ - static gchar *dirname = NULL; - -#ifndef G_OS_WIN32 - if (G_UNLIKELY (dirname == NULL)) - dirname = g_strdup (g_getenv ("GNOME22_USER_DIR")); -#endif - if (dirname == NULL) - dirname = g_build_filename ( - g_get_home_dir (), ".gnome2", NULL); - - return dirname; -} - -/** * e_get_accels_filename: * * Returns the name of the user data file containing custom keyboard diff --git a/e-util/e-util.h b/e-util/e-util.h index 554c9300b1..e1f6c792e4 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -48,7 +48,6 @@ typedef enum { typedef void (*ETypeFunc) (GType type, gpointer user_data); -const gchar * e_get_gnome2_user_dir (void); const gchar * e_get_accels_filename (void); void e_show_uri (GtkWindow *parent, const gchar *uri); |