aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2007-04-23 04:00:45 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2007-04-23 04:00:45 +0800
commite4a4c2f2a2733ee60a918fabe41faf55f7cc7f41 (patch)
treee180d3f2df45f353aa660b260fcd590457e06173 /shell
parent480e48a2565ac2e564eb18c1ce4641d0b3c01065 (diff)
downloadgsoc2013-evolution-e4a4c2f2a2733ee60a918fabe41faf55f7cc7f41.tar.gz
gsoc2013-evolution-e4a4c2f2a2733ee60a918fabe41faf55f7cc7f41.tar.zst
gsoc2013-evolution-e4a4c2f2a2733ee60a918fabe41faf55f7cc7f41.zip
Fix build breaks
svn path=/trunk/; revision=33446
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog4
-rw-r--r--shell/main.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 49a4edee5f..ab77e076f0 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-23 Srinivasa Ragavan <sragavan@novell.com>
+
+ * main.c: (main): Fix 2 build breaks if built with development version
+
2007-04-22 Stephen Cook <siti@orcon.net.nz>
* main.c: fix startup notification problem (closes: #271851)
diff --git a/shell/main.c b/shell/main.c
index c8b49811b8..b6e9c530ce 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -53,6 +53,7 @@
#include <gtk/gtkwindow.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
+#include <gtk/gtktogglebutton.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-util.h>
@@ -526,7 +527,7 @@ main (int argc, char **argv)
#endif
#if DEVELOPMENT
- client = g_conf_client_get_default ();
+ client = gconf_client_get_default ();
if (force_migrate) {
destroy_config (client);