vte r2085 - in trunk: . src

[behdad svn gnome org]

Author: behdad
Date: Wed Aug 13 22:42:47 2008
New Revision: 2085
URL: http://svn.gnome.org/viewvc/vte?rev=2085&view=rev

Log:
2008-08-13  Behdad Esfahbod  <behdad gnome org>

        * src/vte.c (regex_match_clear_cursor),
        (vte_terminal_set_cursor_from_regex_match):
        Fix uninitialized cursor warning.  Setting to NULL sounds
        right to me.  ChPe?



Modified:
   trunk/ChangeLog
   trunk/src/vte.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Wed Aug 13 22:42:47 2008
@@ -1106,6 +1106,9 @@
                         g_free (regex->cursor.cursor_name);
                         regex->cursor.cursor_name = NULL;
                         break;
+		default:
+			g_assert_not_reached ();
+			return;
         }
 }
 
@@ -1128,7 +1131,7 @@
 static void
 vte_terminal_set_cursor_from_regex_match(VteTerminal *terminal, struct vte_match_regex *regex)
 {
-        GdkCursor *cursor;
+        GdkCursor *cursor = NULL;
 
         if (!GTK_WIDGET_REALIZED(terminal))
                 return;
@@ -1144,6 +1147,9 @@
                 case VTE_REGEX_CURSOR_NAME:
                         cursor = gdk_cursor_new_from_name(gtk_widget_get_display(GTK_WIDGET(terminal)), regex->cursor.cursor_name);
                         break;
+		default:
+			g_assert_not_reached ();
+			return;
         }
 
         gdk_window_set_cursor(GTK_WIDGET(terminal)->window, cursor);