gio: fix build
authorIgnacio Casal Quinteiro <icq@gnome.org>
Tue, 2 Dec 2014 13:29:11 +0000 (14:29 +0100)
committerMaciej Wereski <m.wereski@partner.samsung.com>
Fri, 10 Jul 2015 09:47:42 +0000 (11:47 +0200)
next time I should definitely try to compile after a rebase conflict...

gio/gioenums.h

index 8ebdb2f..488e04b 100644 (file)
@@ -539,7 +539,7 @@ typedef enum {
   G_IO_ERROR_PROXY_NEED_AUTH,
   G_IO_ERROR_PROXY_NOT_ALLOWED,
   G_IO_ERROR_BROKEN_PIPE,
-  G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE
+  G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE,
   G_IO_ERROR_NOT_CONNECTED
 } GIOErrorEnum;