[balsa] Merge various fixes
- From: Pawel Salek <pawels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] Merge various fixes
- Date: Mon, 21 Mar 2011 22:26:32 +0000 (UTC)
commit 204d71b85de7a883b3cf158e822e796adbe69dd9
Author: Pawel Salek <pawsa0 gmail com>
Date: Mon Mar 21 23:26:01 2011 +0100
Merge various fixes
* src/balsa-index.c: revert last change, it was wrong.
* Makefile.am: merge patch from bug 645444.
* configure.in: ditto.
* balsa.desktop.in: ditto.
* po/POTFILES.{skip,in}: add balsa-mailto-handler.desktop file.
* src/Makefile.am: fix dist target when configured without gnome
or unique.
ChangeLog | 10 ++++++++++
Makefile.am | 6 +++---
balsa-mailto-handler.desktop.in.in | 14 ++++++++++++++
balsa.desktop.in => balsa.desktop.in.in | 4 +++-
configure.in | 5 +++++
po/POTFILES.in | 3 ++-
po/POTFILES.skip | 2 ++
src/Makefile.am | 6 ++----
src/balsa-index.c | 2 +-
9 files changed, 42 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index db17c6a..9416c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-21 Pawel Salek
+
+ * src/balsa-index.c: revert last change, it was wrong.
+ * Makefile.am: merge patch from bug 645444.
+ * configure.in: ditto.
+ * balsa.desktop.in: ditto.
+ * po/POTFILES.{skip,in}: add balsa-mailto-handler.desktop file.
+ * src/Makefile.am: fix dist target when configured without gnome
+ or unique.
+
2011-01-15 Pawel Salek
* autogen.sh: port fixes from bootstrap.sh (inspired by pancake).
diff --git a/Makefile.am b/Makefile.am
index 4fb5603..484ecf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,8 @@ pixmapdir = $(datadir)/pixmaps
pixmap_DATA = gnome-balsa2.png
desktopdir = $(datadir)/applications
-desktop_in_files = balsa.desktop.in
-desktop_DATA = balsa.desktop
+desktop_in_files = balsa.desktop.in balsa-mailto-handler.desktop.in
+desktop_DATA = balsa.desktop balsa-mailto-handler.desktop
@INTLTOOL_DESKTOP_RULE@
balsa_extra_dist = \
@@ -19,12 +19,12 @@ balsa_extra_dist = \
balsa-mail-style.xml \
balsa-mail.lang \
balsa.1.in \
- balsa.desktop.in \
balsa.spec.in \
bootstrap.sh \
docs/mh-mail-HOWTO \
docs/pine2vcard \
docs/vconvert.awk \
+ $(desktop_in_files) \
gnome-balsa2.png \
intltool-extract.in \
intltool-merge.in \
diff --git a/balsa-mailto-handler.desktop.in.in b/balsa-mailto-handler.desktop.in.in
new file mode 100644
index 0000000..774ee95
--- /dev/null
+++ b/balsa-mailto-handler.desktop.in.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Balsa
+_Comment=E-Mail utility
+_GenericName=Mail Client
+X-GNOME-FullName=Balsa Mail Client
+TryExec=balsa
+Exec=balsa -m %U
+Icon=gnome-balsa2
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories= TOOLKIT_CATEGORIES@Network;Email;
+MimeType=x-scheme-handler/mailto;
+NoDisplay=true
diff --git a/balsa.desktop.in b/balsa.desktop.in.in
similarity index 57%
rename from balsa.desktop.in
rename to balsa.desktop.in.in
index 466d45a..90721d7 100644
--- a/balsa.desktop.in
+++ b/balsa.desktop.in.in
@@ -1,10 +1,12 @@
[Desktop Entry]
_Name=Balsa
_Comment=E-Mail utility
+_GenericName=Mail Client
+X-GNOME-FullName=Balsa Mail Client
TryExec=balsa
Exec=balsa
Icon=gnome-balsa2
Terminal=false
Type=Application
StartupNotify=true
-Categories=GNOME;Network;Email;
+Categories= TOOLKIT_CATEGORIES@Network;Email;
diff --git a/configure.in b/configure.in
index df3864b..e0981e6 100644
--- a/configure.in
+++ b/configure.in
@@ -281,6 +281,7 @@ dnl #####################################################################
dnl GNOME libs
dnl #####################################################################
if test x$with_gnome != xno; then
+ TOOLKIT_CATEGORIES="GNOME;GTK;"
gnome_extras="libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0"
AC_MSG_CHECKING([whether we have gnome-keyring])
if $PKG_CONFIG --atleast-version=1.0 gnome-keyring-1; then
@@ -298,9 +299,11 @@ if test x$with_gnome != xno; then
AC_MSG_RESULT($with_gnome_keyring)
AC_DEFINE(HAVE_GNOME,1,[Defined when gnome libs are available.])
else
+ TOOLKIT_CATEGORIES="GTK;"
gnome_extras=""
fi
AM_CONDITIONAL([BUILD_WITH_GNOME], [test $with_gnome = "yes"])
+AC_SUBST(TOOLKIT_CATEGORIES)
# GMime configuration
#
@@ -1013,6 +1016,8 @@ AC_OUTPUT([
Makefile
balsa.1
balsa.spec
+balsa.desktop.in
+balsa-mailto-handler.desktop.in
po/Makefile.in
sounds/Makefile
images/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea4d885..b8e42a4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,8 @@
[encoding: UTF-8]
# List of source files containing translatable strings.
# Please keep this list in alphabetical order.
-balsa.desktop.in
+balsa-mailto-handler.desktop.in.in
+balsa.desktop.in.in
libbalsa/address-book-extern.c
libbalsa/address-book-ldap.c
libbalsa/address-book-ldif.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e000b28..1ab8514 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,3 +2,5 @@
# Please keep this list in alphabetical order.
balsa-mail.lang
balsa-mail-style.xml
+balsa-mailto-handler.desktop.in
+balsa.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 54b241f..26c7730 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,9 +98,6 @@ balsa_gtkspell_extra = \
spell-check.h
endif
-if BUILD_WITH_UNIQUE
-balsa_bonobo_extra_dist = balsa-bonobo.c balsa-bonobo.h Balsa.idl
-else
if BUILD_WITH_GNOME
balsa_bonobo_extra = balsa-bonobo.c balsa-bonobo.h
balsa_bonobo_extra_dist = Balsa.idl
@@ -115,7 +112,8 @@ $(srcdir)/balsa-bonobo.c: Balsa.h
idldir = $(datadir)/idl
idl_DATA = Balsa.idl
-endif
+else
+balsa_bonobo_extra_dist = balsa-bonobo.c balsa-bonobo.h Balsa.idl
endif
balsa_SOURCES = \
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 98c3898..efb8ef1 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -1035,7 +1035,7 @@ balsa_index_load_mailbox_node (BalsaIndex * index,
} while(try_cnt++<3);
if (!successp)
- return FALSE;
+ return TRUE;
/*
* set the new mailbox
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]