[ekiga] Some #include cleaning, and a renaming strcmp -> g_strcmp0

[Julien Puydt <jpuydt src gnome org>]

commit 5f3528c03f4780a9b53a70a29b9d0e8e07f0be69
Author: Snark <jpuydt gnome org>
Date:   Sun Nov 7 21:11:00 2010 +0100

    Some #include cleaning, and a renaming strcmp -> g_strcmp0

 lib/gui/gmpreferences.c |    9 ++++-----
 lib/gui/gmpreferences.h |    2 --
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/lib/gui/gmpreferences.c b/lib/gui/gmpreferences.c
index 49cbe29..3e31b24 100644
--- a/lib/gui/gmpreferences.c
+++ b/lib/gui/gmpreferences.c
@@ -40,7 +40,6 @@
 
 #include "gmconfwidgets.h"
 
-#include <string.h>
 #include <libintl.h>
 
 enum {
@@ -669,7 +668,7 @@ gnome_prefs_string_option_menu_new (GtkWidget *table,
     conf_string = g_strdup (default_value);
   while (options [cpt]) {
 
-    if (conf_string && !strcmp (conf_string, options [cpt]))
+    if (conf_string && !g_strcmp0 (conf_string, options [cpt]))
       history = cpt;
 
     gtk_list_store_append (GTK_LIST_STORE (list_store), &iter);
@@ -683,7 +682,7 @@ gnome_prefs_string_option_menu_new (GtkWidget *table,
 
   if (history == -1) {
 
-    if (conf_string && strcmp (conf_string, "")) {
+    if (conf_string && g_strcmp0 (conf_string, "")) {
 
       gtk_list_store_append (GTK_LIST_STORE (list_store), &iter);
       gtk_list_store_set (GTK_LIST_STORE (list_store), &iter,
@@ -749,7 +748,7 @@ gnome_prefs_string_option_menu_update (GtkWidget *option_menu,
   cpt = 0;
   while (options [cpt]) {
 
-    if (conf_string && !strcmp (options [cpt], conf_string)) 
+    if (conf_string && !g_strcmp0 (options [cpt], conf_string)) 
       history = cpt;
 
     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -763,7 +762,7 @@ gnome_prefs_string_option_menu_update (GtkWidget *option_menu,
 
   if (history == -1) {
     
-    if (conf_string && strcmp (conf_string, "")) {
+    if (conf_string && g_strcmp0 (conf_string, "")) {
 
       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
diff --git a/lib/gui/gmpreferences.h b/lib/gui/gmpreferences.h
index 1d45328..4324f91 100644
--- a/lib/gui/gmpreferences.h
+++ b/lib/gui/gmpreferences.h
@@ -35,8 +35,6 @@
  *
  */
 
-#include "config.h"
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS