Re: [evolution-patches] Cleanups for evolution/shell

[Kjartan Maraas <kmaraas broadpark no>]

tir, 29,.08.2006 kl. 22.10 +0200, skrev Kjartan Maraas:
> This fixes some warnings and adds a header e-shell-nm-glib.h to export
> the two functions that are used in e-shell-window.c.
> 
And this one rediffed.

Cheers
Kjartan

? shell.error
? warnings
Index: e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.86
diff -u -p -r1.86 e-shell-importer.c
--- e-shell-importer.c	30 Apr 2006 03:22:56 -0000	1.86
+++ e-shell-importer.c	22 Sep 2006 15:08:54 -0000
@@ -275,7 +275,10 @@ static ImportDialogFilePage *
 importer_file_page_new (ImportData *data)
 {
 	ImportDialogFilePage *page;
-	GtkWidget *table, *label, *entry;
+	GtkWidget *table, *label;
+#ifndef USE_GTKFILECHOOSER
+	GtkWidget  *entry;
+#endif
 	int row = 0;
 
 	page = g_new0 (ImportDialogFilePage, 1);
Index: e-shell-nm-glib.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-nm-glib.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-shell-nm-glib.c
--- e-shell-nm-glib.c	27 Jul 2006 09:40:15 -0000	1.5
+++ e-shell-nm-glib.c	22 Sep 2006 15:08:54 -0000
@@ -29,6 +29,7 @@
 #include <Evolution.h>
 #include <NetworkManager/libnm_glib.h>
 #include <e-shell-window.h>
+#include "e-shell-nm-glib.h"
 
 static libnm_glib_ctx *nm_ctx = NULL;
 static guint id = 0;
Index: e-shell-nm-glib.h
===================================================================
RCS file: e-shell-nm-glib.h
diff -N e-shell-nm-glib.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ e-shell-nm-glib.h	22 Sep 2006 15:08:54 -0000
@@ -0,0 +1,34 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* e-shell.h
+ *
+ * Copyright (C) 2006  Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Kjartan Maraas
+ */
+
+#ifndef _E_SHELL_NM_GLIB_H_
+#define _E_SHELL_NM_GLIB_H_
+
+#include "e-shell-window.h"
+
+G_BEGIN_DECLS
+
+int e_shell_nm_glib_initialise (EShellWindow *window);
+void e_shell_nm_glib_dispose (EShellWindow *window);
+
+G_END_DECLS
+#endif /* _E_SHELL_NM_GLIB_H_ */
Index: e-shell-window.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window.c,v
retrieving revision 1.54
diff -u -p -r1.54 e-shell-window.c
--- e-shell-window.c	18 Sep 2006 17:26:32 -0000	1.54
+++ e-shell-window.c	22 Sep 2006 15:08:55 -0000
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include "e-shell-nm-glib.h"
 #include "e-shell-window.h"
 #include "e-shell-view.h"