check for text!=NULL. (gtk_entry_prepend_text): likewise. some else picky

Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
                (gtk_entry_prepend_text): likewise.
                        some else picky indentation fixes.

9 files changed, 72 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c994dfd40..4af4ed8a6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Mar 23 15:26:25 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_append_text): check for text!=NULL.
+	(gtk_entry_prepend_text): likewise.
+	some else picky indentation fixes.
+
 Mon Mar 23 12:03:03 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
         * examples/: added this directory with stuff from
diff --git a/TODO b/TODO
index 7314ade7d..1f564a621 100644
--- a/TODO
+++ b/TODO
@@ -2,17 +2,13 @@ TODO BEFORE GTK 1.0
 -------------------
 
 Bugs:
- * scrolled windows get cought in an endless reallocation loop under
-   certain (rare) circumstances.
+ * Scrolled windows (GtkList?) get cought in an endless reallocation loop
+   under certain (rare) circumstances.
 
  * Widget redrawing when the window resizes sometimes messes up.
    GtkLabels sometimes redraw without clearing up the underlying background on
    window resizes.
  
- * GtkTree and GtkList should express in their *_add implementations,
-   that they expect GtkListItems/GtkTreeItems as children. Similar
-   things might apply to other containers.
-
  * delay dnd settings to take effect once a widget is realized, this is
    to avoid force realizations. i think this goes along with owens dnd
    changes?
@@ -79,6 +75,7 @@ TODO AFTER GTK 1.0
  * Make all widget attributes configurable after the widget is created (timj).
 
  * GtkCList improvements. (Jay Painter)
+
  * Seperate GtkObject and signaling system from Gdk dependancies?
   
  * move *_input_add (wrappers for select(2)) mechanism into glib.
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b42416740..b44bda168 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -312,6 +312,7 @@ gtk_entry_append_text (GtkEntry *entry,
 
   g_return_if_fail (entry != NULL);
   g_return_if_fail (GTK_IS_ENTRY (entry));
+  g_return_if_fail (text != NULL);
 
   tmp_pos = entry->text_length;
   gtk_editable_insert_text (GTK_EDITABLE(entry), text, strlen (text), &tmp_pos);
@@ -326,6 +327,7 @@ gtk_entry_prepend_text (GtkEntry *entry,
 
   g_return_if_fail (entry != NULL);
   g_return_if_fail (GTK_IS_ENTRY (entry));
+  g_return_if_fail (text != NULL);
 
   tmp_pos = 0;
   gtk_editable_insert_text (GTK_EDITABLE(entry), text, strlen (text), &tmp_pos);
@@ -361,8 +363,9 @@ gtk_entry_set_editable(GtkEntry *entry,
 {
   g_return_if_fail (entry != NULL);
   g_return_if_fail (GTK_IS_ENTRY (entry));
-  GTK_EDITABLE(entry)->editable = editable;
-  gtk_entry_queue_draw(entry);
+
+  GTK_EDITABLE (entry)->editable = editable;
+  gtk_entry_queue_draw (entry);
 }
 
 gchar*
@@ -1766,6 +1769,7 @@ static void
 gtk_move_backward_character (GtkEntry *entry)
 {
   GtkEditable *editable;
+
   editable = GTK_EDITABLE (entry);
 
   if (0 < editable->current_pos)
@@ -1781,12 +1785,12 @@ gtk_move_backward_character (GtkEntry *entry)
 static void
 gtk_move_forward_word (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gchar *text;
   gint i;
   wchar_t c;
   gint len;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (entry->text && (editable->current_pos < entry->text_length))
@@ -1839,11 +1843,11 @@ gtk_move_forward_word (GtkEntry *entry)
 static void
 gtk_move_backward_word (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gchar *text;
   gint i;
   wchar_t c;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (entry->text && editable->current_pos > 0)
@@ -1910,21 +1914,21 @@ gtk_move_backward_word (GtkEntry *entry)
 static void
 gtk_move_beginning_of_line (GtkEntry *entry)
 {
-  GTK_EDITABLE(entry)->current_pos = 0;
+  GTK_EDITABLE (entry)->current_pos = 0;
 }
 
 static void
 gtk_move_end_of_line (GtkEntry *entry)
 {
-  GTK_EDITABLE(entry)->current_pos = entry->text_length;
+  GTK_EDITABLE (entry)->current_pos = entry->text_length;
 }
 
 static void
 gtk_delete_forward_character (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gint old_pos;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (editable->selection_start_pos != editable->selection_end_pos)
@@ -1940,9 +1944,9 @@ gtk_delete_forward_character (GtkEntry *entry)
 static void
 gtk_delete_backward_character (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gint old_pos;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (editable->selection_start_pos != editable->selection_end_pos)
@@ -1958,9 +1962,9 @@ gtk_delete_backward_character (GtkEntry *entry)
 static void
 gtk_delete_forward_word (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gint old_pos;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (editable->selection_start_pos != editable->selection_end_pos)
@@ -1976,9 +1980,9 @@ gtk_delete_forward_word (GtkEntry *entry)
 static void
 gtk_delete_backward_word (GtkEntry *entry)
 {
+  GtkEditable *editable;
   gint old_pos;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   if (editable->selection_start_pos != editable->selection_end_pos)
@@ -2004,12 +2008,13 @@ gtk_delete_to_line_end (GtkEntry *entry)
 }
 
 static void
-gtk_select_word (GtkEntry *entry, guint32 time)
+gtk_select_word (GtkEntry *entry,
+		 guint32   time)
 {
+  GtkEditable *editable;
   gint start_pos;
   gint end_pos;
 
-  GtkEditable *editable;
   editable = GTK_EDITABLE (entry);
 
   gtk_move_backward_word (entry);
@@ -2024,9 +2029,11 @@ gtk_select_word (GtkEntry *entry, guint32 time)
 }
 
 static void
-gtk_select_line (GtkEntry *entry, guint32 time)
+gtk_select_line (GtkEntry *entry,
+		 guint32   time)
 {
   GtkEditable *editable;
+
   editable = GTK_EDITABLE (entry);
 
   editable->has_selection = TRUE;
@@ -2037,10 +2044,11 @@ gtk_select_line (GtkEntry *entry, guint32 time)
 }
 
 static void 
-gtk_entry_set_selection       (GtkEditable       *editable,
-			       gint               start,
-			       gint               end)
+gtk_entry_set_selection (GtkEditable       *editable,
+			 gint               start,
+			 gint               end)
 {
+  g_return_if_fail (editable != NULL);
   g_return_if_fail (GTK_IS_ENTRY (editable));
 
   if (end < 0)
@@ -2057,15 +2065,15 @@ gtk_entry_select_region  (GtkEntry       *entry,
 			  gint            start,
 			  gint            end)
 {
-  gtk_editable_select_region (GTK_EDITABLE(entry), start, end);
+  gtk_editable_select_region (GTK_EDITABLE (entry), start, end);
 }
 
 void
 gtk_entry_set_max_length (GtkEntry     *entry,
                           guint16       max)
 {
-  g_return_if_fail(entry != NULL);
-  g_return_if_fail(GTK_IS_ENTRY(entry));
+  g_return_if_fail (entry != NULL);
+  g_return_if_fail (GTK_IS_ENTRY (entry));
 
   if (max && entry->text_length > max)
   	gtk_editable_delete_text(GTK_EDITABLE(entry), max, -1);