gnome-media r3805 - in trunk/grecord: . src

[malureau svn gnome org]

Author: malureau
Date: Sat Mar 22 21:21:22 2008
New Revision: 3805
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3805&view=rev

Log:
2008-03-22  Marc-Andre Lureau  <marcandre lureau gmail com>

	* src/gsr-window.c: more checking before string comparisons, use
	g_str_equal instead of strcmp.


Modified:
   trunk/grecord/ChangeLog
   trunk/grecord/src/gsr-window.c

Modified: trunk/grecord/src/gsr-window.c
==============================================================================
--- trunk/grecord/src/gsr-window.c	(original)
+++ trunk/grecord/src/gsr-window.c	Sat Mar 22 21:21:22 2008
@@ -1814,7 +1814,7 @@
 		t = l->data;
 		if (t == NULL || t->label == NULL)
 			continue;
-		if ((strcmp (t->label, text) == 0) &&
+		if ((g_str_equal (t->label, text)) &&
 		    (t->flags & GST_MIXER_TRACK_INPUT)) {
 			if (new == NULL)
 				new = g_object_ref (t);
@@ -1866,7 +1866,7 @@
 		if ((t->flags & GST_MIXER_TRACK_RECORD) && (selected == NULL)) {
 			gtk_combo_box_set_active (GTK_COMBO_BOX (window->priv->input), i - 1);
 		}
-		if ((selected != NULL) && strcmp (selected, t->label) == 0) {
+		if ((selected != NULL) && g_str_equal (selected, t->label)) {
 			gtk_combo_box_set_active (GTK_COMBO_BOX (window->priv->input), i - 1);
 		}
 	}
@@ -2369,7 +2369,9 @@
 	switch (prop_id) {
 	case PROP_LOCATION:
 		if (priv->filename != NULL) {
-			if (strcmp (g_value_get_string (value), priv->filename) == 0) {
+			if (g_value_get_string (value) == NULL)
+				return;
+			if (g_str_equal (g_value_get_string (value), priv->filename)) {
 				return;
 			}
 		}