Re: [evolution-patches] Yet more 64bit cleanups

[Jeremy Katz <katzj redhat com>]

On Wed, 2003-05-07 at 23:40, Not Zed wrote:
> On Thu, 2003-05-08 at 06:59, Jeremy Katz wrote:
> > On Wed, 2003-05-07 at 13:33, Ettore Perazzoli wrote:
> > > On Mon, 2003-05-05 at 19:10, Jeremy Katz wrote:
> > > > Attached are patches to fix a number of places that aren't 64bit
> > > > clean.   It's not a small set of changes, but the vast majority of the
> > > > changes fall into one of a few categories:
> > > 
> > > Hmm...  What's the purpose of the e-shell-offline-handler.c patch?
> > 
> > It cleans up some warnings and I was on a roll with them :) 
> > 
> > Since you're using a GtkTreeView, you generally want to use a
> > GtkTreeStore instead of a GtkListStore.  Additionally, the GtkTreeModel
> > is an interface and isn't usually what you directly instantiate.
> 
> What if what you actually want is a list, and not a tree?

Oops...  my brain was obviously elsewhere by that point of wading
through warnings.

You still want to use a GtkListStore instead of the model directly. 
Updated shell patch attached. 

Jeremy

Index: shell//ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1266
diff -u -r1.1266 ChangeLog
--- shell//ChangeLog	5 May 2003 01:12:39 -0000	1.1266
+++ shell//ChangeLog	8 May 2003 02:44:16 -0000
@@ -1,3 +1,10 @@
+2003-05-05  Jeremy Katz  <katzj redhat com>
+
+	* main.c: Add a #include to fix a warning.
+
+	* e-shell-offline-handler.c (update_dialog_clist): Use a list
+	store instead of a tree model for the store.
+
 2003-05-02  Not Zed  <NotZed Ximian com>
 
 	* e-shell-about-box.c (text[]): grepped changelogs and added all
Index: shell//e-shell-offline-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-offline-handler.c,v
retrieving revision 1.31
diff -u -r1.31 e-shell-offline-handler.c
--- shell//e-shell-offline-handler.c	27 Mar 2003 21:01:41 -0000	1.31
+++ shell//e-shell-offline-handler.c	8 May 2003 02:44:16 -0000
@@ -33,6 +33,7 @@
 
 #include "e-shell-marshal.h"
 
+#include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkclist.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtklabel.h>
@@ -548,8 +549,7 @@
 {
 	EShellOfflineHandlerPrivate *priv;
 	GtkWidget *tree_view;
-	GtkTreeModel *model;
-	GtkTreeModel *model_sort;
+	GtkListStore *model;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 
@@ -569,7 +569,7 @@
 	model = gtk_list_store_new (1, G_TYPE_STRING);
 	g_hash_table_foreach (priv->id_to_component_info, update_dialog_tree_view_hash_foreach, model);
 
-	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
+	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL(model));
 }
 
 static void
Index: shell//main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.120
diff -u -r1.120 main.c
--- shell//main.c	28 Apr 2003 18:17:21 -0000	1.120
+++ shell//main.c	8 May 2003 02:44:16 -0000
@@ -24,6 +24,7 @@
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-gtk-utils.h"
+#include "e-util/e-proxy.h"
 
 #include "e-icon-factory.h"
 #include "e-shell-constants.h"