You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/09/25 06:01:50 UTC
svn commit: r1389702 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Author: svn-role
Date: Tue Sep 25 04:01:49 2012
New Revision: 1389702
URL: http://svn.apache.org/viewvc?rev=1389702&view=rev
Log:
Merge r1378847 from trunk:
* r1378847
Make GNOME keyring library work with very old glib.
Justification:
Keyring library fails to load at runtime and it's hard for the user
to work out why.
Votes:
+1: philip, brane, stsp
+0: danielsh
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1378847
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1389702&r1=1389701&r2=1389702&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Sep 25 04:01:49 2012
@@ -166,12 +166,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1378847
- Make GNOME keyring library work with very old glib.
- Justification:
- Keyring library fails to load at runtime and it's hard for the user
- to work out why.
- Votes:
- +1: philip, brane, stsp
- +0: danielsh
Modified: subversion/branches/1.7.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1389702&r1=1389701&r2=1389702&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Tue Sep 25 04:01:49 2012
@@ -457,12 +457,14 @@ simple_gnome_keyring_save_creds(svn_bool
pool);
}
+#if GLIB_CHECK_VERSION(2,6,0)
static void
log_noop(const gchar *log_domain, GLogLevelFlags log_level,
const gchar *message, gpointer user_data)
{
/* do nothing */
}
+#endif
static void
init_gnome_keyring(void)
@@ -478,7 +480,9 @@ init_gnome_keyring(void)
suppress stderr spam for not only libgnome-keyring, but for
anything else the app is linked to that uses glib logging and
doesn't specify a log_domain. */
+#if GLIB_CHECK_VERSION(2,6,0)
g_log_set_default_handler(log_noop, NULL);
+#endif
}
static const svn_auth_provider_t gnome_keyring_simple_provider = {