Re: [Ayatana-commits] [Merge] lp:~ken-vandine/evolution-indicator/evo_3.4 into lp:evolution-indicator
Review: Approve The po/Makefile.in.in changes look odd, but they're apparently taken from intltool. -- https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477 Your team ayatana-commits is subscribed to branch lp:evolution-indicator. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~ken-vandine/evolution-indicator/evo_3.4 into lp:evolution-indicator
The proposal to merge lp:~ken-vandine/evolution-indicator/evo_3.4 into lp:evolution-indicator has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477 -- https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477 Your team ayatana-commits is subscribed to branch lp:evolution-indicator. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/evolution-indicator/trunk] Rev 86: Ported to evolution 3.4
Merge authors:
Ken VanDine (ken-vandine)
Related merge proposals:
https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477
proposed by: Ken VanDine (ken-vandine)
review: Approve - Ted Gould (ted)
revno: 86 [merge]
committer: Ken VanDine ken.vand...@canonical.com
branch nick: evolution-indicator
timestamp: Wed 2012-05-30 15:49:10 -0400
message:
Ported to evolution 3.4
modified:
configure.ac
po/Makefile.in.in
src/evolution-indicator.c
--
lp:evolution-indicator
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk
Your team ayatana-commits is subscribed to branch lp:evolution-indicator.
To unsubscribe from this branch go to
https://code.launchpad.net/~indicator-applet-developers/evolution-indicator/trunk/+edit-subscription
=== modified file 'configure.ac'
--- configure.ac 2011-09-09 08:45:39 +
+++ configure.ac 2012-05-25 21:05:11 +
@@ -70,7 +70,7 @@
AC_SUBST(GCC_FLAGS)
PKG_CHECK_MODULES(DEPS,
- indicate-0.6 = 0.5.90
+ indicate-0.7 = 0.6.90
$EVOLUTION_PLUGIN
dbus-1
dbus-glib-1
@@ -78,6 +78,9 @@
libcanberra
$GTKHTML_EDITOR
unity
+ libebackend-1.2
+ libsoup-2.4
+ gconf-2.0
)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in 2009-11-19 18:51:08 +
+++ po/Makefile.in.in 2012-05-25 21:05:11 +
@@ -49,8 +49,8 @@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@@ -73,15 +73,20 @@
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo MSGFMT $@;
+
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $ $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- $(MSGFMT) -o $@ $
+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $
.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
rm -f $$file $(GMSGFMT) -o $$file $
.po.cat:
=== modified file 'src/evolution-indicator.c'
--- src/evolution-indicator.c 2011-06-28 22:10:50 +
+++ src/evolution-indicator.c 2012-05-25 21:05:11 +
@@ -42,6 +42,8 @@
#include shell/es-event.h
#include shell/e-shell-view.h
+#include camel/camel.h
+
#include libindicate/server.h
#include libindicate/indicator.h
#include libindicate/indicator-messages.h
@@ -142,7 +144,6 @@
static GdkWindow *root = NULL;
gboolean res = FALSE;
Windowxwindow;
- GList *list;
EShell *evo_shell;
EShellWindow *shell_window;
@@ -180,16 +181,9 @@
}
evo_shell = e_shell_get_default ();
- list = e_shell_get_watched_windows (evo_shell);
-
- /* Find the first EShellWindow in the list. */
- while (list != NULL !E_IS_SHELL_WINDOW (list-data))
-list = g_list_next (list);
-
- g_return_if_fail (list != NULL);
/* Get the shell window. */
- shell_window = E_SHELL_WINDOW (list-data);
+ shell_window = E_SHELL_WINDOW (e_shell_get_active_window (evo_shell));
if (GTK_IS_WINDOW (shell_window))
{
@@ -228,10 +222,13 @@
org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
{
gchar *url;
+ CamelURL *service_url;
g_return_if_fail (t != NULL);
- url = camel_service_get_url (CAMEL_SERVICE (t-store));
+ service_url = camel_service_new_camel_url (CAMEL_SERVICE (t-store));
+ url = camel_url_to_string (service_url, 0);
+ camel_url_free (service_url);
if (!t-new)
return;
@@ -1008,22 +1005,13 @@
if (shell)
{
GSList*i;
-GList *list;
-GtkWindow *mail_window = NULL;
EShellWindow *shell_window;
EShellView *shell_view;
GtkAction *action;
-list = e_shell_get_watched_windows (shell);
-
-/* Find the first EShellWindow in the list. */
-while (list != NULL !E_IS_SHELL_WINDOW (list-data))
-list = g_list_next (list);
-
-g_return_if_fail (list != NULL);
/* Present the shell window. */
-shell_window = E_SHELL_WINDOW (list-data);
+shell_window = E_SHELL_WINDOW
[Ayatana-commits] [Merge] lp:~ken-vandine/evolution-indicator/evo_3.4 into lp:evolution-indicator
The proposal to merge lp:~ken-vandine/evolution-indicator/evo_3.4 into lp:evolution-indicator has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477 -- https://code.launchpad.net/~ken-vandine/evolution-indicator/evo_3.4/+merge/107477 Your team ayatana-commits is subscribed to branch lp:evolution-indicator. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~allanlesage/evolution-indicator/TDD into lp:evolution-indicator
Allan LeSage has proposed merging lp:~allanlesage/evolution-indicator/TDD into lp:evolution-indicator. Requested reviews: Charles Kerr (charlesk) For more details, see: https://code.launchpad.net/~allanlesage/evolution-indicator/TDD/+merge/108050 Here I have given the gcov treatment to evolution-indicator, so that we can measure its code-coverage. Note that `make coverage-html` will fail at the moment as there are no tests. -- https://code.launchpad.net/~allanlesage/evolution-indicator/TDD/+merge/108050 Your team ayatana-commits is subscribed to branch lp:evolution-indicator. === modified file 'Makefile.am' --- Makefile.am 2010-10-12 16:33:57 + +++ Makefile.am 2012-05-30 20:36:18 + @@ -15,3 +15,5 @@ else \ echo Failed to generate ChangeLog 2; \ fi + +include $(top_srcdir)/Makefile.am.coverage === added file 'Makefile.am.coverage' --- Makefile.am.coverage 1970-01-01 00:00:00 + +++ Makefile.am.coverage 2012-05-30 20:36:18 + @@ -0,0 +1,48 @@ + +# Coverage targets + +.PHONY: clean-gcno clean-gcda \ + coverage-html generate-coverage-html clean-coverage-html \ + coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr + +clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr + +if HAVE_GCOV + +clean-gcno: + @echo Removing old coverage instrumentation + -find -name '*.gcno' -print | xargs -r rm + +clean-gcda: + @echo Removing old coverage results + -find -name '*.gcda' -print | xargs -r rm + +coverage-html: clean-gcda + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html + +generate-coverage-html: + @echo Collecting coverage data + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title Code Coverage --legend --show-details coverage.info + +clean-coverage-html: clean-gcda + -$(LCOV) --directory $(top_builddir) -z + -rm -rf coverage.info coveragereport + +if HAVE_GCOVR + +coverage-gcovr: clean-gcda + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr + +generate-coverage-gcovr: + @echo Generating coverage GCOVR report + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml + +clean-coverage-gcovr: clean-gcda + -rm -rf $(top_builddir)/coverage.xml + +endif # HAVE_GCOVR + +endif # HAVE_GCOV === modified file 'configure.ac' --- configure.ac 2012-05-25 21:05:11 + +++ configure.ac 2012-05-30 20:36:18 + @@ -44,6 +44,18 @@ fi AC_SUBST(EVO_PLUGIN_DIR) +dnl ** +dnl gcov coverage reporting +dnl ** + +m4_include([m4/gcov.m4]) +AC_TDD_GCOV +AM_CONDITIONAL([HAVE_GCOV], [test x$ac_cv_check_gcov = xyes]) +AM_CONDITIONAL([HAVE_LCOV], [test x$ac_cv_check_lcov = xyes]) +AM_CONDITIONAL([HAVE_GCOVR], [test x$ac_cv_check_gcovr = xyes]) +AC_SUBST(COVERAGE_CFLAGS) +AC_SUBST(COVERAGE_CXXFLAGS) +AC_SUBST(COVERAGE_LDFLAGS) dnl ** dnl i18n === added directory 'm4' === added file 'm4/gcov.m4' --- m4/gcov.m4 1970-01-01 00:00:00 + +++ m4/gcov.m4 2012-05-30 20:36:18 + @@ -0,0 +1,86 @@ +# Checks for existence of coverage tools: +# * gcov +# * lcov +# * genhtml +# * gcovr +# +# Sets ac_cv_check_gcov to yes if tooling is present +# and reports the executables to the variables LCOV, GCOVR and GENHTML. +AC_DEFUN([AC_TDD_GCOV], +[ + AC_ARG_ENABLE(gcov, + AS_HELP_STRING([--enable-gcov], + [enable coverage testing with gcov]), + [use_gcov=$enableval], [use_gcov=no]) + + if test x$use_gcov = xyes; then + # we need gcc: + if test $GCC != yes; then +AC_MSG_ERROR([GCC is required for --enable-gcov]) + fi + + # Check if ccache is being used + AC_CHECK_PROG(SHTOOL, shtool, shtool) + case `$SHTOOL path $CC` in +*ccache*[)] gcc_ccache=yes;; +*[)] gcc_ccache=no;; + esac + + if test $gcc_ccache = yes (test -z $CCACHE_DISABLE || test $CCACHE_DISABLE != 1); then +AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.]) + fi + + lcov_version_list=1.6 1.7 1.8 1.9 + AC_CHECK_PROG(LCOV, lcov, lcov) + AC_CHECK_PROG(GENHTML, genhtml, genhtml) + + if test $LCOV; then +AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ + glib_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do +if test $lcov_version = $lcov_check_version; then + glib_cv_lcov_version=$lcov_check_version (ok) +fi + done +]) + else +lcov_msg=To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list +AC_MSG_ERROR([$lcov_msg]) + fi + + case $glib_cv_lcov_version in +|invalid[)] + lcov_msg=You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version). +
