Release version 0.13

stefwalter · stefwalter · commit 1cc0dac8d4e0 · 2014-06-30T09:37:27.000+02:00
* And fix a make distcheck issue
diff --git a/configure.ac b/configure.ac
@@ -16,7 +16,7 @@
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 
 AC_INIT([Cockpit],
-        [0.12],
+        [0.13],
         [devel@lists.cockpit-project.org],
         [cockpit],
         [http://www.cockpit-project.org/])
diff --git a/src/agent/cockpitdbusjson.c b/src/agent/cockpitdbusjson.c
@@ -1374,7 +1374,8 @@ on_object_manager_ready (GObject *source,
 
   if (self->object_manager == NULL)
     {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
+          g_cancellable_is_cancelled (self->cancellable))
         {
           g_debug ("%s", error->message);
         }

Original file line number	Diff line number	Diff line change
`@@ -1374,7 +1374,8 @@ on_object_manager_ready (GObject *source,`
`1374`	`1374`
`1375`	`1375`	`if (self->object_manager == NULL)`
`1376`	`1376`	`{`
`1377`		`- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))`
	`1377`	`+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) \|\|`
	`1378`	`+ g_cancellable_is_cancelled (self->cancellable))`
`1378`	`1379`	`{`
`1379`	`1380`	`g_debug ("%s", error->message);`
`1380`	`1381`	`}`