[pan2] * further compile fixes * compile DBUS only for libgio-2.0 version >= 2.26
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] * further compile fixes * compile DBUS only for libgio-2.0 version >= 2.26
- Date: Tue, 24 Apr 2012 15:35:26 +0000 (UTC)
commit 46da49117e1eef7c3b4d61ae4ae7e315d154bb36
Author: Heinrich MÃller <henmull src gnome org>
Date: Tue Apr 24 17:35:11 2012 +0200
* further compile fixes
* compile DBUS only for libgio-2.0 version >= 2.26
configure.in | 10 ++++++----
pan/gui/pan.cc | 8 ++++----
pan/gui/post-ui.cc | 2 +-
uulib/uulib.c | 2 +-
4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index def0c3e..85975bd 100644
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,7 @@ ENCHANT_REQUIRED=1.6.0
GNUTLS_REQUIRED=2.12.10
LIBNOTIFY_REQUIRED=0.4.1
LIBGKR_REQUIRED=3.2.0
+LIBGIO_REQUIRED=2.26.0
AC_SUBST(GLIB_REQUIRED)
AC_SUBST(GMIME_REQUIRED)
AC_SUBST(GTK_REQUIRED)
@@ -59,6 +60,7 @@ AC_SUBST(GTKSPELL_REQUIRED)
AC_SUBST(GNUTLS_REQUIRED)
AC_SUBST(LIBNOTIFY_REQUIRED)
AC_SUBST(LIBGKR_REQUIRED)
+AC_SUBST(LIBGIO_REQUIRED)
dnl LIBGSASL_REQUIRED=1.6.1
dnl AC_SUBST(LIBGSASL_REQUIRED)
@@ -105,10 +107,10 @@ if test "x$have_gmime26" = "xyes" ; then
fi
dnl D-Bus support
- AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[enable D-Bus support (normally: yes)]), [want_dbus=$withval], [want_dbus=yes])
- if test "x$want_dbus" = "xyes" ; then
- AC_DEFINE(HAVE_DBUS,[1],[D-Bus support for multiple Pan instances])
- fi
+AC_ARG_WITH(dbus, AS_HELP_STRING([--with-dbus],[enable D-Bus support (normally: yes)]), [want_dbus=$withval], [want_dbus=yes])
+if test "x$want_dbus" = "xyes" ; then
+ PKG_CHECK_MODULES([LIBGIO],[gio-2.0 >= $LIBGIO_REQUIRED],AC_DEFINE(HAVE_DBUS,[1],[D-Bus support for multiple Pan instances]),[])
+fi
dnl GtkSpell support
gtkspell_msg=no
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index e3be7d4..9f20a89 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -245,8 +245,8 @@ namespace
bool n() { return notif_shown; }
StatusIconListener(GtkStatusIcon * i, GtkWidget* r, Prefs& p, Queue& q, Data& d, bool v) :
- icon(i), root(r), prefs(p), queue(q), data(d),
- tasks_active(0), tasks_total(0), minimized(v), notif_shown(false)
+ icon(i), root(r), prefs(p), queue(q), data(d), minimized(v),
+ tasks_active(0), tasks_total(0), notif_shown(false)
{
prefs.add_listener(this);
queue.add_listener(this);
@@ -641,11 +641,11 @@ _("General Options\n"
EncodeCache& encode_cache;
Prefs& prefs;
GroupPrefs& group_prefs;
+ GDBusNodeInfo * busnodeinfo;
int dbus_id;
- bool name_valid;
bool lost_name;
+ bool name_valid;
- GDBusNodeInfo * busnodeinfo;
GDBusInterfaceVTable ifacetable;
Pan(Data& d, Queue& q, ArticleCache& c, EncodeCache& ec, Prefs& p, GroupPrefs& gp) :
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 0fb455f..c52aa14 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -180,7 +180,7 @@ PostUI:: update_filequeue_label (GtkTreeSelection *selection)
TaskUpload * task (dynamic_cast<TaskUpload*>(*it));
if (task) kb += task->_bytes/1024;
}
- g_snprintf(str,sizeof(str), _("Upload queue: %lu tasks, %ld KB (~ %.2f MB) total."), tasks.size(), kb, kb/1024.0f);
+ g_snprintf(str,sizeof(str), _("Upload queue: %u tasks, %ld KB (~ %.2f MB) total."), tasks.size(), kb, kb/1024.0f);
gtk_label_set_text (GTK_LABEL(_filequeue_label), str);
}
diff --git a/uulib/uulib.c b/uulib/uulib.c
index 1b7060b..1387e51 100644
--- a/uulib/uulib.c
+++ b/uulib/uulib.c
@@ -1193,7 +1193,7 @@ UUCleanUp (void)
itbd *iter=ftodel, *ptr;
uulist *liter;
uufile *fiter;
- allomap *aiter;
+ //allomap *aiter;
/*
* delete temporary input files (such as the copy of stdin)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]