[gnome-pilot/gtk3] Add missing include to e_pilot_settings.c
- From: Matthew Charles Davey <mcdavey src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-pilot/gtk3] Add missing include to e_pilot_settings.c
- Date: Sun, 20 Mar 2011 22:36:53 +0000 (UTC)
commit a11632dcf319ba8e8f24cabed87af0bfe4f5dae9
Author: Matt Davey <mcdavey mrao cam ac uk>
Date: Sun Mar 20 22:34:47 2011 +0000
Add missing include to e_pilot_settings.c
ChangeLog | 5 +----
conduits/evolution-data-server/e-pilot-settings.c | 3 ++-
configure.ac | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 61728a9..f1077b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-03-13 Matt Davey <mcdavey mrao cam ac uk>
+2011-03-20 Matt Davey <mcdavey mrao cam ac uk>
* gtk3 branch
* Fix #644319. Avoid registering a "EPilot_Settings" multiple
times from different Evolution conduits, by calling
@@ -18,9 +18,6 @@
* conduits/conduits/test/test.conduit.in: ditto
-
-
-
2011-03-13 Matt Davey <mcdavey mrao cam ac uk>
* gtk3 branch: merge changes from master
* capplet/pilot.c: Avoid sending non-UTF8 pilot-encoded username
diff --git a/conduits/evolution-data-server/e-pilot-settings.c b/conduits/evolution-data-server/e-pilot-settings.c
index 0ab0b58..8245f8e 100644
--- a/conduits/evolution-data-server/e-pilot-settings.c
+++ b/conduits/evolution-data-server/e-pilot-settings.c
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <glib-object.h>
#include <libedataserverui/e-source-combo-box.h>
#include "e-pilot-settings.h"
@@ -45,7 +46,7 @@ static GObjectClass *parent_class = NULL;
GType
e_pilot_settings_get_type (void)
{
- static GType type = g_type_from_name ("EPilotSettings");
+ GType type = g_type_from_name ((const) "EPilotSettings");
if (!type) {
static GTypeInfo info = {
diff --git a/configure.ac b/configure.ac
index 94bc068..d6621f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Version
dnl ******************************
m4_define([gnome_pilot_major], [2])
m4_define([gnome_pilot_revision], [91])
-m4_define([gnome_pilot_patchlevel], [91])
+m4_define([gnome_pilot_patchlevel], [92])
m4_define([gnome_pilot_version],
[gnome_pilot_major.gnome_pilot_revision.gnome_pilot_patchlevel])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]