[Rasta-commits] jlbec commits r225 - in trunk: cgirasta clrasta gtkrasta tools

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-12-07 17:44:17 -0600 (Wed, 07 Dec 2005)
New Revision: 225

Modified:
   trunk/cgirasta/jsha.c
   trunk/clrasta/clrasta.c
   trunk/gtkrasta/gtkrasta.c
   trunk/tools/gtkrastaliststore.c
Log:
Fix a couple things to make it happy with modern GTK+GLib

Modified: trunk/cgirasta/jsha.c
===================================================================
--- trunk/cgirasta/jsha.c	2004-04-23 19:09:16 UTC (rev 224)
+++ trunk/cgirasta/jsha.c	2005-12-07 23:44:17 UTC (rev 225)
@@ -52,6 +52,7 @@
  */
 
 
+#include <string.h>
 #include <glib.h>
 
 #include "jsha.h"

Modified: trunk/clrasta/clrasta.c
===================================================================
--- trunk/clrasta/clrasta.c	2004-04-23 19:09:16 UTC (rev 224)
+++ trunk/clrasta/clrasta.c	2005-12-07 23:44:17 UTC (rev 225)
@@ -407,7 +407,7 @@
     gint i_result, i, num_items, len;
     gchar **list_items, **res_items;
     GList *l_result, *elem;
-    gssize br, bw;
+    gsize br, bw;
     GError *error;
 
     name = rasta_dialog_field_get_text(field);
@@ -754,8 +754,8 @@
     gchar *t_val, *t_new_val, *prompt, *tmp;
     CLRQueryFlags flags;
     CLRQueryResult ret;
-    gint i_result, num_items;
-    gchar **list_items, **val_items;
+    gint i_result = -1, num_items = 0;
+    gchar **list_items, **val_items = NULL;
     GList *l_result;
 
     name = rasta_dialog_field_get_text(field);
@@ -1963,7 +1963,7 @@
  */
 static gboolean run_menu(RastaContext *ctxt, RastaScreen *screen)
 {
-    gint count, num_choices, ret_id, res;
+    gint count, num_choices, ret_id = 0, res;
     gchar *title, *help;
     GList *m_items, *elem;
     CLRMenuItem *item;

Modified: trunk/gtkrasta/gtkrasta.c
===================================================================
--- trunk/gtkrasta/gtkrasta.c	2004-04-23 19:09:16 UTC (rev 224)
+++ trunk/gtkrasta/gtkrasta.c	2005-12-07 23:44:17 UTC (rev 225)
@@ -3823,7 +3823,7 @@
     bar = GTK_WIDGET(g_object_get_data(G_OBJECT(box), "progress"));
     timeout_id = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(bar),
                                                     "timeout_id"));
-    gtk_timeout_remove(timeout_id);
+    g_source_remove(timeout_id);
     /*
      * FIXME (somehow): Broken GTK redraw leaves 'active'
      * bar sometimes

Modified: trunk/tools/gtkrastaliststore.c
===================================================================
--- trunk/tools/gtkrastaliststore.c	2004-04-23 19:09:16 UTC (rev 224)
+++ trunk/tools/gtkrastaliststore.c	2005-12-07 23:44:17 UTC (rev 225)
@@ -572,6 +572,8 @@
   g_return_if_fail (GTK_IS_RASTA_LIST_STORE (rasta_list_store));
   g_return_if_fail (VALID_ITER (iter, rasta_list_store));
 
+  path = gtk_rasta_list_store_get_path (GTK_TREE_MODEL (rasta_list_store), iter);
+
   cur = (xmlNodePtr)iter->user_data;
   xmlUnlinkNode(cur);
   xmlFreeNode(cur);