merge dnfdaemon-0.3.14 release

Author: Tim Lauridsen

ChangeLog

@@ -1,3 +1,20 @@
+2016-04-29  Tim Lauridsen <timlau@fedoraproject.org>
+
+	* dnfdaemon.spec: bumped version to 0.3.14
+
+2016-04-29  Tim Lauridsen <timlau@fedoraproject.org>
+
+	* python/dnfdaemon/client/__init__.py: fallback to use
+	GObject.G_MAXINT
+
+2016-04-29  Tim Lauridsen <timlau@fedoraproject.org>
+
+	Merge branch 'release-0.3.13' into develop
+
+2016-04-29  Tim Lauridsen <timlau@fedoraproject.org>
+
+	* ChangeLog: updated ChangeLog
+
 2016-04-29  Tim Lauridsen <timlau@fedoraproject.org>
 
 	* dnfdaemon.spec: bumped version to 0.3.13

dnfdaemon.spec

@@ -2,7 +2,7 @@
 %global dnf_version 1.1.0
 
 Name:           dnfdaemon
-Version:        0.3.13
+Version:        0.3.14
 Release:        1%{?dist}
 Summary:        DBus daemon for dnf package actions
 License:        GPLv2+
@@ -99,6 +99,9 @@ fi
 %{python3_sitelib}/%{name}/client
 
 %changelog
+* Fri Apr 29 2016 Tim Lauridsen <timlau@fedoraproject.org> 0.3.14-1
+- bumped release
+
 * Fri Apr 29 2016 Tim Lauridsen <timlau@fedoraproject.org> 0.3.13-1
 - bumped release
 

python/dnfdaemon/client/__init__.py

@@ -108,7 +108,7 @@ def on_RepoMetaDataProgress(self, name, frac):
 
 logger = logging.getLogger("dnfdaemon.client")
 
-from gi.repository import Gio, GLib
+from gi.repository import Gio, GLib, GObject
 
 ORG = 'org.baseurl.DnfSystem'
 INTERFACE = ORG
@@ -288,7 +288,7 @@ def _run_dbus_async(self, cmd, *args):
         func = getattr(self.daemon, cmd)
         # timeout = infinite
         func(*args, result_handler=self._return_handler,
-             user_data=data, timeout=GLib.G_MAXINT)
+             user_data=data, timeout=GObject.G_MAXINT)
         data['main_loop'].run()
         result = self._get_result(data)
         return result