2009-11-25 [holger] 3.7.3cvs22

* Makefile.am
	* src/common/Makefile.am
	* src/common/utils.c
	* src/common/utils.h
		Add a function to query the
		filepath of the .desktop file
This commit is contained in:
Holger Berndt 2009-11-25 22:14:02 +00:00
parent e58620f7d8
commit 24f2589ccc
7 changed files with 27 additions and 1 deletions

View file

@ -1,3 +1,12 @@
2009-11-25 [holger] 3.7.3cvs22
* Makefile.am
* src/common/Makefile.am
* src/common/utils.c
* src/common/utils.h
Add a function to query the
filepath of the .desktop file
2009-11-25 [colin] 3.7.3cvs21
* src/imap.c

View file

@ -26,6 +26,8 @@ pixmap64_DATA=claws-mail-64x64.png
pixmap128dir=$(datadir)/icons/hicolor/128x128/apps
pixmap128_DATA=claws-mail-128x128.png
# when changing the name or location of the .desktop file,
# also update src/common/Makefile.am
gnomapdir = $(datadir)/applications
gnomap_DATA=claws-mail.desktop

View file

@ -3895,3 +3895,4 @@
( cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/printing.c; ) > 3.7.3cvs19.patchset
( cvs diff -u -r 1.36.2.178 -r 1.36.2.179 src/common/utils.c; ) > 3.7.3cvs20.patchset
( cvs diff -u -r 1.179.2.248 -r 1.179.2.249 src/imap.c; ) > 3.7.3cvs21.patchset
( cvs diff -u -r 1.24.2.28 -r 1.24.2.29 Makefile.am; cvs diff -u -r 1.24.2.19 -r 1.24.2.20 src/common/Makefile.am; cvs diff -u -r 1.36.2.179 -r 1.36.2.180 src/common/utils.c; cvs diff -u -r 1.20.2.72 -r 1.20.2.73 src/common/utils.h; ) > 3.7.3cvs22.patchset

View file

@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=21
EXTRA_VERSION=22
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -1,4 +1,6 @@
PLUGINDIR = $(pkglibdir)/plugins/
DESKTOPFILEPATH=$(datadir)/applications/claws-mail.desktop
noinst_LTLIBRARIES = libclawscommon.la
if OS_WIN32
@ -78,6 +80,7 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\" \
-DPLUGINDIR=\"$(PLUGINDIR)\" \
-DDATAROOTDIR=\""$(datarootdir)"\" \
-DDESKTOPFILEPATH=\"$(DESKTOPFILEPATH)\" \
-DGTK_DISABLE_DEPRECATED
libclawscommon_la_LIBADD = \

View file

@ -1993,6 +1993,16 @@ const gchar *get_cert_file(void)
}
#endif
/* Return the filepath of the claws-mail.desktop file */
const gchar *get_desktop_file(void)
{
#ifdef DESKTOPFILEPATH
return DESKTOPFILEPATH;
#else
return NULL;
#endif
}
/* Return the default directory for Plugins. */
const gchar *get_plugin_dir(void)
{

View file

@ -422,6 +422,7 @@ const gchar *get_tmp_dir (void);
const gchar *get_locale_dir (void);
gchar *get_tmp_file (void);
const gchar *get_domain_name (void);
const gchar *get_desktop_file(void);
#ifdef G_OS_WIN32
const gchar *get_themes_dir (void);
const gchar *get_cert_file (void);