GNOME.org
 

[gnome-packagekit] Remove the users of egg_strequal() and use g_strcmp0 instead

commit 3add2cad1dc4929545479dc0db52810c15b0912d
Author: Richard Hughes <richard hughsie com>
Date:   Wed Jul 29 15:42:18 2009 +0100

    Remove the users of egg_strequal() and use g_strcmp0 instead

 src/egg-markdown.c      |   44 ++++++++++++++++++++++----------------------
 src/egg-string.c        |   18 +++++++++---------
 src/gpk-animated-icon.c |    2 +-
 src/gpk-application.c   |   26 +++++++++++++-------------
 src/gpk-auto-refresh.c  |   14 +++++++-------
 src/gpk-check-update.c  |   22 +++++++++++-----------
 src/gpk-dbus-task.c     |   12 ++++++------
 src/gpk-dbus.c          |   28 ++++++++++++++--------------
 src/gpk-desktop.c       |    4 ++--
 src/gpk-enum.c          |   14 +++++++-------
 src/gpk-firmware.c      |    4 ++--
 src/gpk-hardware.c      |    4 ++--
 src/gpk-log.c           |    8 ++++----
 src/gpk-service-pack.c  |    6 +++---
 src/gpk-vendor.c        |    4 ++--
 src/gpk-watch.c         |    8 ++++----
 16 files changed, 109 insertions(+), 109 deletions(-)
---
diff --git a/src/egg-markdown.c b/src/egg-markdown.c
index a02f88d..c7984e3 100644
--- a/src/egg-markdown.c
+++ b/src/egg-markdown.c
@@ -1025,7 +1025,7 @@ egg_markdown_test (EggTest *test)
 	 ************************************************************/
 	text = egg_markdown_replace ("summary -- really -- sure!", " -- ", " â?? ");
 	egg_test_title (test, "replace (multiple)");
-	if (egg_strequal (text, "summary â?? really â?? sure!"))
+	if (g_strcmp0 (text, "summary â?? really â?? sure!") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1036,7 +1036,7 @@ egg_markdown_test (EggTest *test)
 	 ************************************************************/
 	text = egg_markdown_to_text_line_formatter ("**is important** text", "**", "<b>", "</b>");
 	egg_test_title (test, "formatter (left)");
-	if (egg_strequal (text, "<b>is important</b> text"))
+	if (g_strcmp0 (text, "<b>is important</b> text") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1045,7 +1045,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("this is **important**", "**", "<b>", "</b>");
 	egg_test_title (test, "formatter (right)");
-	if (egg_strequal (text, "this is <b>important</b>"))
+	if (g_strcmp0 (text, "this is <b>important</b>") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1054,7 +1054,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("**important**", "**", "<b>", "</b>");
 	egg_test_title (test, "formatter (only)");
-	if (egg_strequal (text, "<b>important</b>"))
+	if (g_strcmp0 (text, "<b>important</b>") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1063,7 +1063,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("***important***", "**", "<b>", "</b>");
 	egg_test_title (test, "formatter (only)");
-	if (egg_strequal (text, "<b>*important</b>*"))
+	if (g_strcmp0 (text, "<b>*important</b>*") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1072,7 +1072,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("I guess * this is * not bold", "*", "<i>", "</i>");
 	egg_test_title (test, "formatter (with spaces)");
-	if (egg_strequal (text, "I guess * this is * not bold"))
+	if (g_strcmp0 (text, "I guess * this is * not bold") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1081,7 +1081,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("this **is important** text in **several** places", "**", "<b>", "</b>");
 	egg_test_title (test, "formatter (middle, multiple)");
-	if (egg_strequal (text, "this <b>is important</b> text in <b>several</b> places"))
+	if (g_strcmp0 (text, "this <b>is important</b> text in <b>several</b> places") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1090,7 +1090,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_word_auto_format_code ("this is http://www.hughsie.com/with_spaces_in_url inline link");
 	egg_test_title (test, "auto formatter (url)");
-	if (egg_strequal (text, "this is `http://www.hughsie.com/with_spaces_in_url` inline link"))
+	if (g_strcmp0 (text, "this is `http://www.hughsie.com/with_spaces_in_url` inline link") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1099,7 +1099,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("this was \"triffic\" it was", "\"", "â??", "â??");
 	egg_test_title (test, "formatter (quotes)");
-	if (egg_strequal (text, "this was â??trifficâ?? it was"))
+	if (g_strcmp0 (text, "this was â??trifficâ?? it was") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1108,7 +1108,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	text = egg_markdown_to_text_line_formatter ("This isn't a present", "'", "â??", "â??");
 	egg_test_title (test, "formatter (one quote)");
-	if (egg_strequal (text, "This isn't a present"))
+	if (g_strcmp0 (text, "This isn't a present") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -1134,7 +1134,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ Bullett";
 	egg_test_title (test, "markdown (type2 header)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1147,7 +1147,7 @@ egg_markdown_test (EggTest *test)
 	egg_test_title (test, "markdown (autocode)");
 	egg_markdown_set_autocode (self, TRUE);
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1158,7 +1158,7 @@ egg_markdown_test (EggTest *test)
 	markdown_expected = "<b><i> This software is currently in alpha state </b></i>";
 	egg_test_title (test, "markdown some invalid header");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1174,7 +1174,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ Another";
 	egg_test_title (test, "markdown (complex1)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1204,7 +1204,7 @@ egg_markdown_test (EggTest *test)
 		   "Paragraph two isn't much better.";
 	egg_test_title (test, "markdown (complex1)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1229,7 +1229,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ Fubar update because of \"security\"";
 	egg_test_title (test, "markdown (complex2)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1248,7 +1248,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ third item";
 	egg_test_title (test, "markdown (list with spaces)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1266,7 +1266,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ list seporated with spaces - first item";
 	egg_test_title (test, "markdown (one line limit)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1282,7 +1282,7 @@ egg_markdown_test (EggTest *test)
 		   "â?¢ list & spaces";
 	egg_test_title (test, "markdown (escaping)");
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
@@ -1291,7 +1291,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "markdown (free text)");
 	text = egg_markdown_parse (self, "This isn't a present");
-	if (egg_strequal (text, "This isn't a present"))
+	if (g_strcmp0 (text, "This isn't a present") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s'", text);
@@ -1300,7 +1300,7 @@ egg_markdown_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "markdown (autotext underscore)");
 	text = egg_markdown_parse (self, "This isn't CONFIG_UEVENT_HELPER_PATH present");
-	if (egg_strequal (text, "This isn't <tt>CONFIG_UEVENT_HELPER_PATH</tt> present"))
+	if (g_strcmp0 (text, "This isn't <tt>CONFIG_UEVENT_HELPER_PATH</tt> present") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s'", text);
@@ -1327,7 +1327,7 @@ egg_markdown_test (EggTest *test)
 	egg_markdown_set_escape (self, TRUE);
 	ret = egg_markdown_set_max_lines (self, 1024);
 	text = egg_markdown_parse (self, markdown);
-	if (egg_strequal (text, markdown_expected))
+	if (g_strcmp0 (text, markdown_expected) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got '%s', expected '%s'", text, markdown_expected);
diff --git a/src/egg-string.c b/src/egg-string.c
index 2e860df..091795b 100644
--- a/src/egg-string.c
+++ b/src/egg-string.c
@@ -226,7 +226,7 @@ egg_strvequal (gchar **id1, gchar **id2)
 
 	/* text equal each one */
 	for (i=0; i<length1; i++) {
-		if (!egg_strequal (id1[i], id2[i]))
+		if (g_strcmp0 (id1[i], id2[i]) != 0)
 			return FALSE;
 	}
 
@@ -288,14 +288,14 @@ egg_string_test (EggTest *test)
 	 ************************************************************/
 	egg_test_title (test, "egg_strequal same argument");
 	temp = "dave";
-	if (egg_strequal (temp, temp))
+	if (g_strcmp0 (temp, temp) == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "incorrect ret when both same");
 
 	/************************************************************/
 	egg_test_title (test, "egg_strequal both const");
-	if (egg_strequal ("dave", "dave"))
+	if (g_strcmp0 ("dave", "dave") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "incorrect ret when both same");
@@ -373,12 +373,12 @@ egg_string_test (EggTest *test)
 
 	/************************************************************/
 	egg_test_title (test, "id strcmp pass");
-	ret = egg_strequal ("moo;0.0.1;i386;fedora", "moo;0.0.1;i386;fedora");
+	ret = g_strcmp0 ("moo;0.0.1;i386;fedora", "moo;0.0.1;i386;fedora") == 0;
 	egg_test_assert (test, ret);
 
 	/************************************************************/
 	egg_test_title (test, "id strcmp fail");
-	ret = egg_strequal ("moo;0.0.1;i386;fedora", "moo;0.0.2;i386;fedora");
+	ret = g_strcmp0 ("moo;0.0.1;i386;fedora", "moo;0.0.2;i386;fedora") == 0;
 	egg_test_assert (test, !ret);
 
 	/************************************************************
@@ -412,7 +412,7 @@ egg_string_test (EggTest *test)
 	 ************************************************************/
 	egg_test_title (test, "replace start");
 	text_safe = egg_strreplace ("richard\nhughes", "r", "e");
-	if (egg_strequal (text_safe, "eichaed\nhughes"))
+	if (g_strcmp0 (text_safe, "eichaed\nhughes") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed the replace '%s'", text_safe);
@@ -421,7 +421,7 @@ egg_string_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "replace none");
 	text_safe = egg_strreplace ("richard\nhughes", "dave", "e");
-	if (egg_strequal (text_safe, "richard\nhughes"))
+	if (g_strcmp0 (text_safe, "richard\nhughes") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed the replace '%s'", text_safe);
@@ -430,7 +430,7 @@ egg_string_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "replace end");
 	text_safe = egg_strreplace ("richard\nhughes", "s", "e");
-	if (egg_strequal (text_safe, "richard\nhughee"))
+	if (g_strcmp0 (text_safe, "richard\nhughee") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed the replace '%s'", text_safe);
@@ -439,7 +439,7 @@ egg_string_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "replace unicode");
 	text_safe = egg_strreplace ("richard\n- hughes", "\n- ", "\nâ?¢ ");
-	if (egg_strequal (text_safe, "richard\nâ?¢ hughes"))
+	if (g_strcmp0 (text_safe, "richard\nâ?¢ hughes") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed the replace '%s'", text_safe);
diff --git a/src/gpk-animated-icon.c b/src/gpk-animated-icon.c
index 32692c0..8217b59 100644
--- a/src/gpk-animated-icon.c
+++ b/src/gpk-animated-icon.c
@@ -93,7 +93,7 @@ gpk_animated_icon_set_filename_tile (GpkAnimatedIcon *icon, GtkIconSize size, co
 	g_return_val_if_fail (name != NULL, FALSE);
 
 	/* have we already set the same icon */
-	if (egg_strequal (icon->filename, name)) {
+	if (g_strcmp0 (icon->filename, name) == 0) {
 		egg_debug ("already set the same icon name %s, ignoring", name);
 		return FALSE;
 	}
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 4dd5c65..bea2ca9 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -902,7 +902,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 
 	g_return_if_fail (GPK_IS_APPLICATION (application));
 
-	installed = egg_strequal (details->id->data, "installed");
+	installed = g_strcmp0 (details->id->data, "installed") == 0;
 
 	/* hide to start */
 	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "scrolledwindow_detail"));
@@ -911,7 +911,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	gtk_list_store_clear (application->priv->details_store);
 
 	/* if a collection, mark as such */
-	if (egg_strequal (details->id->data, "meta"))
+	if (g_strcmp0 (details->id->data, "meta") == 0)
 		/* TRANSLATORS: the type of package is a collection (metagroup) */
 		gpk_application_add_detail_item (application, _("Type"), _("Collection"), NULL);
 
@@ -971,7 +971,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	if (details->size > 0) {
 		/* set the size */
 		value = g_format_size_for_display (details->size);
-		if (egg_strequal (details->id->data, "meta"))
+		if (g_strcmp0 (details->id->data, "meta") == 0)
 			/* TRANSLATORS: the size of the meta package */
 			gpk_application_add_detail_item (application, _("Size"), value, NULL);
 		else if (installed)
@@ -984,7 +984,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	}
 
 	/* set the repo text, or hide if installed */
-	if (!installed && !egg_strequal (details->id->data, "meta")) {
+	if (!installed && g_strcmp0 (details->id->data, "meta") != 0) {
 		/* get the full name of the repo from the repo_id */
 		repo_name = gpk_application_get_full_repo_name (application, details->id->data);
 		/* TRANSLATORS: where the package came from, the software source name */
@@ -2135,9 +2135,9 @@ gpk_application_groups_treeview_clicked_cb (GtkTreeSelection *selection, GpkAppl
 		}
 
 		/* GetPackages? */
-		if (egg_strequal (application->priv->group, "all-packages"))
+		if (g_strcmp0 (application->priv->group, "all-packages") == 0)
 			application->priv->search_mode = PK_MODE_ALL_PACKAGES;
-		else if (egg_strequal (application->priv->group, "selected"))
+		else if (g_strcmp0 (application->priv->group, "selected") == 0)
 			application->priv->search_mode = PK_MODE_SELECTED;
 		else
 			application->priv->search_mode = PK_MODE_GROUP;
@@ -3226,7 +3226,7 @@ gpk_application_group_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter
 	gchar *name = NULL;
 	gboolean ret;
 	gtk_tree_model_get (model, iter, GROUPS_COLUMN_ID, &name, -1);
-	ret = egg_strequal (name, "separator");
+	ret = g_strcmp0 (name, "separator") == 0;
 	g_free (name);
 	return ret;
 }
@@ -3461,7 +3461,7 @@ gpk_application_categories_finished (GpkApplication *application)
 		do {
 			/* only allows groups two layers deep */
 			obj2 = pk_obj_list_index (list, j);
-			if (egg_strequal (obj2->parent_id, obj->cat_id)) {
+			if (g_strcmp0 (obj2->parent_id, obj->cat_id) == 0) {
 				gtk_tree_store_append (application->priv->groups_store, &iter2, &iter);
 				gtk_tree_store_set (application->priv->groups_store, &iter2,
 						    GROUPS_COLUMN_NAME, obj2->name,
@@ -3536,14 +3536,14 @@ gpk_application_gconf_key_changed_cb (GConfClient *client, guint cnxn_id, GConfE
 	if (value == NULL)
 		return;
 
-	if (egg_strequal (gconf_entry->key, GPK_CONF_APPLICATION_CATEGORY_GROUPS)) {
+	if (g_strcmp0 (gconf_entry->key, GPK_CONF_APPLICATION_CATEGORY_GROUPS) == 0) {
 		ret = gconf_value_get_bool (value);
 		gtk_tree_store_clear (application->priv->groups_store);
 		if (ret)
 			gpk_application_create_group_list_categories (application);
 		else
 			gpk_application_create_group_list_enum (application);
-	} else if (egg_strequal (gconf_entry->key, GPK_CONF_AUTOCOMPLETE)) {
+	} else if (g_strcmp0 (gconf_entry->key, GPK_CONF_AUTOCOMPLETE) == 0) {
 		ret = gconf_value_get_bool (value);
 		entry = GTK_ENTRY (gtk_builder_get_object (application->priv->builder, "entry_text"));
 		if (ret) {
@@ -4192,11 +4192,11 @@ gpk_application_init (GpkApplication *application)
 	}
 
 	/* search by name */
-	if (egg_strequal (mode, "name")) {
+	if (g_strcmp0 (mode, "name") == 0) {
 		gpk_application_menu_search_by_name (NULL, application);
 
 	/* set to details if we can we do the action? */
-	} else if (egg_strequal (mode, "details")) {
+	} else if (g_strcmp0 (mode, "details") == 0) {
 		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_DETAILS)) {
 			gpk_application_menu_search_by_description (NULL, application);
 		} else {
@@ -4205,7 +4205,7 @@ gpk_application_init (GpkApplication *application)
 		}
 
 	/* set to file if we can we do the action? */
-	} else if (egg_strequal (mode, "file")) {
+	} else if (g_strcmp0 (mode, "file") == 0) {
 		gpk_application_menu_search_by_file (NULL, application);
 
 		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_FILE)) {
diff --git a/src/gpk-auto-refresh.c b/src/gpk-auto-refresh.c
index 47ce381..7711f00 100644
--- a/src/gpk-auto-refresh.c
+++ b/src/gpk-auto-refresh.c
@@ -382,13 +382,13 @@ static void
 gpk_auto_refresh_gconf_key_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, GpkAutoRefresh *arefresh)
 {
 	g_return_if_fail (GPK_IS_AUTO_REFRESH (arefresh));
-	if (egg_strequal (entry->key, GPK_CONF_SESSION_STARTUP_TIMEOUT) ||
-	    egg_strequal (entry->key, GPK_CONF_FORCE_GET_UPDATES_LOGIN) ||
-	    egg_strequal (entry->key, GPK_CONF_FREQUENCY_GET_UPDATES) ||
-	    egg_strequal (entry->key, GPK_CONF_FREQUENCY_GET_UPGRADES) ||
-	    egg_strequal (entry->key, GPK_CONF_FREQUENCY_REFRESH_CACHE) ||
-	    egg_strequal (entry->key, GPK_CONF_AUTO_UPDATE) ||
-	    egg_strequal (entry->key, GPK_CONF_UPDATE_BATTERY))
+	if (g_strcmp0 (entry->key, GPK_CONF_SESSION_STARTUP_TIMEOUT) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_FORCE_GET_UPDATES_LOGIN) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_FREQUENCY_GET_UPDATES) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_FREQUENCY_GET_UPGRADES) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_FREQUENCY_REFRESH_CACHE) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_AUTO_UPDATE) == 0 ||
+	    g_strcmp0 (entry->key, GPK_CONF_UPDATE_BATTERY) == 0)
 		gpk_auto_refresh_change_state (arefresh);
 }
 
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 4b96fc0..bd3f3c2 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -422,43 +422,43 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
 	gchar **package_ids;
 	GpkCheckUpdate *cupdate = GPK_CHECK_UPDATE (data);
 
-	if (egg_strequal (action, "do-not-show-complete-restart")) {
+	if (g_strcmp0 (action, "do-not-show-complete-restart") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_COMPLETE_RESTART, FALSE, NULL);
-	} else if (egg_strequal (action, "do-not-show-complete")) {
+	} else if (g_strcmp0 (action, "do-not-show-complete") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_COMPLETE);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_COMPLETE, FALSE, NULL);
-	} else if (egg_strequal (action, "do-not-show-update-started")) {
+	} else if (g_strcmp0 (action, "do-not-show-update-started") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_STARTED);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_STARTED, FALSE, NULL);
-	} else if (egg_strequal (action, "do-not-show-notify-critical")) {
+	} else if (g_strcmp0 (action, "do-not-show-notify-critical") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_CRITICAL);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_CRITICAL, FALSE, NULL);
-	} else if (egg_strequal (action, "do-not-show-update-not-battery")) {
+	} else if (g_strcmp0 (action, "do-not-show-update-not-battery") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_NOT_BATTERY, FALSE, NULL);
-	} else if (egg_strequal (action, "distro-upgrade-do-not-show-available")) {
+	} else if (g_strcmp0 (action, "distro-upgrade-do-not-show-available") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_DISTRO_UPGRADES);
 		gconf_client_set_bool (cupdate->priv->gconf_client, GPK_CONF_NOTIFY_DISTRO_UPGRADES, FALSE, NULL);
 //	} else if (egg_strequal (action, "show-error-details")) {
 //		/* TRANSLATORS: detailed text about the error */
 //		gpk_error_dialog (_("Error details"), _("Package Manager error details"), cupdate->priv->error_details);
-	} else if (egg_strequal (action, "cancel")) {
+	} else if (g_strcmp0 (action, "cancel") == 0) {
 		/* try to cancel */
 		ret = pk_client_cancel (cupdate->priv->client_primary, &error);
 		if (!ret) {
 			egg_warning ("failed to cancel client: %s", error->message);
 			g_error_free (error);
 		}
-	} else if (egg_strequal (action, "update-all-packages")) {
+	} else if (g_strcmp0 (action, "update-all-packages") == 0) {
 		gpk_check_update_update_system (cupdate);
-	} else if (egg_strequal (action, "show-update-viewer")) {
+	} else if (g_strcmp0 (action, "show-update-viewer") == 0) {
 		ret = g_spawn_command_line_async (BINDIR "/gpk-update-viewer", &error);
 		if (!ret) {
 			egg_warning ("Failure launching update viewer: %s", error->message);
 			g_error_free (error);
 		}
-	} else if (egg_strequal (action, "update-just-security")) {
+	} else if (g_strcmp0 (action, "update-just-security") == 0) {
 
 		ret = pk_client_reset (cupdate->priv->client_primary, &error);
 		if (!ret) {
@@ -480,7 +480,7 @@ gpk_check_update_libnotify_cb (NotifyNotification *notification, gchar *action,
 		}
 		g_strfreev (package_ids);
 
-	} else if (egg_strequal (action, "distro-upgrade-info")) {
+	} else if (g_strcmp0 (action, "distro-upgrade-info") == 0) {
 		ret = g_spawn_command_line_async (DATADIR "/PackageKit/pk-upgrade-distro.sh", &error);
 		if (!ret) {
 			egg_warning ("Failure launching pk-upgrade-distro.sh: %s", error->message);
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 0cce8e3..36ce3d4 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -382,7 +382,7 @@ gpk_dbus_task_libnotify_cb (NotifyNotification *notification, gchar *action, gpo
 {
 	GpkDbusTask *task = GPK_DBUS_TASK (data);
 
-	if (egg_strequal (action, "show-error-details")) {
+	if (g_strcmp0 (action, "show-error-details") == 0) {
 		/* TRANSLATORS: detailed text about the error */
 		gpk_error_dialog (_("Error details"), _("Package Manager error details"), task->priv->error_details);
 	} else {
@@ -3143,8 +3143,8 @@ static gboolean
 gpk_dbus_task_path_is_trusted (const gchar *exec)
 {
 	/* special case the plugin helper -- it's trusted */
-	if (egg_strequal (exec, "/usr/libexec/gst-install-plugins-helper") ||
-	    egg_strequal (exec, "/usr/libexec/pk-gstreamer-install"))
+	if (g_strcmp0 (exec, "/usr/libexec/gst-install-plugins-helper") == 0 ||
+	    g_strcmp0 (exec, "/usr/libexec/pk-gstreamer-install") == 0)
 		return TRUE;
 	return FALSE;
 }
@@ -3422,7 +3422,7 @@ gpk_dbus_task_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "convert tag to lang");
 	lang = gpk_dbus_task_font_tag_to_lang (":lang=mn");
-	if (egg_strequal (lang, "mn"))
+	if (g_strcmp0 (lang, "mn") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "lang '%s'", lang);
@@ -3431,7 +3431,7 @@ gpk_dbus_task_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "convert tag to language");
 	language = gpk_dbus_task_font_tag_to_localised_name (task, ":lang=mn");
-	if (egg_strequal (language, "Mongolian"))
+	if (g_strcmp0 (language, "Mongolian") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "language '%s'", language);
@@ -3456,7 +3456,7 @@ gpk_dbus_task_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "get package for exec");
 	package = gpk_dbus_task_get_package_for_exec (task, "/usr/bin/totem");
-	if (egg_strequal (package, "totem"))
+	if (g_strcmp0 (package, "totem") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "package '%s'", package);
diff --git a/src/gpk-dbus.c b/src/gpk-dbus.c
index 3991b23..b1f3130 100644
--- a/src/gpk-dbus.c
+++ b/src/gpk-dbus.c
@@ -230,39 +230,39 @@ gpk_dbus_set_interaction_from_text (PkBitfield *interact, gint *timeout, const g
 
 	/* do special keys first */
 	for (i=0; i<len; i++) {
-		if (egg_strequal (interactions[i], "always"))
+		if (g_strcmp0 (interactions[i], "always") == 0)
 			*interact = GPK_CLIENT_INTERACT_ALWAYS;
-		else if (egg_strequal (interactions[i], "never"))
+		else if (g_strcmp0 (interactions[i], "never") == 0)
 			*interact = GPK_CLIENT_INTERACT_NEVER;
 	}
 
 	/* add or remove from defaults */
 	for (i=0; i<len; i++) {
 		/* show */
-		if (egg_strequal (interactions[i], "show-confirm-search"))
+		if (g_strcmp0 (interactions[i], "show-confirm-search") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_CONFIRM_SEARCH);
-		else if (egg_strequal (interactions[i], "show-confirm-deps"))
+		else if (g_strcmp0 (interactions[i], "show-confirm-deps") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_CONFIRM_DEPS);
-		else if (egg_strequal (interactions[i], "show-confirm-install"))
+		else if (g_strcmp0 (interactions[i], "show-confirm-install") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_CONFIRM_INSTALL);
-		else if (egg_strequal (interactions[i], "show-progress"))
+		else if (g_strcmp0 (interactions[i], "show-progress") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_PROGRESS);
-		else if (egg_strequal (interactions[i], "show-finished"))
+		else if (g_strcmp0 (interactions[i], "show-finished") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_FINISHED);
-		else if (egg_strequal (interactions[i], "show-warning"))
+		else if (g_strcmp0 (interactions[i], "show-warning") == 0)
 			pk_bitfield_add (*interact, GPK_CLIENT_INTERACT_WARNING);
 		/* hide */
-		else if (egg_strequal (interactions[i], "hide-confirm-search"))
+		else if (g_strcmp0 (interactions[i], "hide-confirm-search") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_CONFIRM_SEARCH);
-		else if (egg_strequal (interactions[i], "hide-confirm-deps"))
+		else if (g_strcmp0 (interactions[i], "hide-confirm-deps") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_CONFIRM_DEPS);
-		else if (egg_strequal (interactions[i], "hide-confirm-install"))
+		else if (g_strcmp0 (interactions[i], "hide-confirm-install") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_CONFIRM_INSTALL);
-		else if (egg_strequal (interactions[i], "hide-progress"))
+		else if (g_strcmp0 (interactions[i], "hide-progress") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_PROGRESS);
-		else if (egg_strequal (interactions[i], "hide-finished"))
+		else if (g_strcmp0 (interactions[i], "hide-finished") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_FINISHED);
-		else if (egg_strequal (interactions[i], "hide-warning"))
+		else if (g_strcmp0 (interactions[i], "hide-warning") == 0)
 			pk_bitfield_remove (*interact, GPK_CLIENT_INTERACT_WARNING);
 		/* wait */
 		else if (g_str_has_prefix (interactions[i], "timeout="))
diff --git a/src/gpk-desktop.c b/src/gpk-desktop.c
index 2d1e567..81ee46c 100644
--- a/src/gpk-desktop.c
+++ b/src/gpk-desktop.c
@@ -191,7 +191,7 @@ gpk_desktop_get_file_weight (const gchar *filename)
 
 	/* application */
 	value = g_key_file_get_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TYPE, NULL);
-	if (egg_strequal (value, G_KEY_FILE_DESKTOP_TYPE_APPLICATION))
+	if (g_strcmp0 (value, G_KEY_FILE_DESKTOP_TYPE_APPLICATION) == 0)
 		weight += 10;
 	g_free (value);
 
@@ -208,7 +208,7 @@ gpk_desktop_get_file_weight (const gchar *filename)
 	g_free (value);
 
 	value = g_key_file_get_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, NULL);
-	if (egg_strequal (value, "true"))
+	if (g_strcmp0 (value, "true") == 0)
 		weight -= 100;
 	g_free (value);
 
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index 5ea4575..9a6e67e 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -1749,7 +1749,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the role icon name enums");
 	for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
 		string = gpk_role_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_role_enum_to_text (i));
 			break;
 		}
@@ -1760,7 +1760,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the status animation enums");
 	for (i=0; i<PK_ROLE_ENUM_UNKNOWN; i++) {
 		string = gpk_status_enum_to_animation (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_role_enum_to_text (i));
 			break;
 		}
@@ -1771,7 +1771,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the info icon names enums");
 	for (i=0; i<PK_INFO_ENUM_UNKNOWN; i++) {
 		string = gpk_info_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_info_enum_to_text (i));
 			break;
 		}
@@ -1793,7 +1793,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the status icon names enums");
 	for (i=0; i<PK_STATUS_ENUM_UNKNOWN; i++) {
 		string = gpk_status_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_status_enum_to_text (i));
 			break;
 		}
@@ -1804,7 +1804,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the restart icon names enums");
 	for (i=0; i<PK_RESTART_ENUM_UNKNOWN; i++) {
 		string = gpk_restart_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_restart_enum_to_text (i));
 			break;
 		}
@@ -1848,7 +1848,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the message icon name enums");
 	for (i=0; i<PK_MESSAGE_ENUM_UNKNOWN; i++) {
 		string = gpk_message_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_message_enum_to_text (i));
 			break;
 		}
@@ -1892,7 +1892,7 @@ gpk_enum_test (gpointer data)
 	egg_test_title (test, "check we convert all the group icon name enums");
 	for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
 		string = gpk_group_enum_to_icon_name (i);
-		if (string == NULL || egg_strequal (string, "help-browser")) {
+		if (string == NULL || g_strcmp0 (string, "help-browser") == 0) {
 			egg_test_failed (test, "failed to get %s", pk_group_enum_to_text (i));
 			break;
 		}
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index cb9c50a..2b06354 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -103,9 +103,9 @@ gpk_firmware_libnotify_cb (NotifyNotification *notification, gchar *action, gpoi
 {
 	GpkFirmware *firmware = GPK_FIRMWARE (data);
 
-	if (egg_strequal (action, "install-firmware")) {
+	if (g_strcmp0 (action, "install-firmware") == 0) {
 		gpk_firmware_install_file (firmware);
-	} else if (egg_strequal (action, "do-not-show-prompt-firmware")) {
+	} else if (g_strcmp0 (action, "do-not-show-prompt-firmware") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_ENABLE_CHECK_FIRMWARE);
 		gconf_client_set_bool (firmware->priv->gconf_client, GPK_CONF_ENABLE_CHECK_FIRMWARE, FALSE, NULL);
 	} else {
diff --git a/src/gpk-hardware.c b/src/gpk-hardware.c
index 0704e99..dc26a66 100644
--- a/src/gpk-hardware.c
+++ b/src/gpk-hardware.c
@@ -103,9 +103,9 @@ gpk_hardware_libnotify_cb (NotifyNotification *notification, gchar *action, gpoi
 {
 	GpkHardware *hardware = GPK_HARDWARE (data);
 
-	if (egg_strequal (action, GPK_HARDWARE_INSTALL_ACTION)) {
+	if (g_strcmp0 (action, GPK_HARDWARE_INSTALL_ACTION) == 0) {
 		gpk_hardware_install_package (hardware);
-	} else if (egg_strequal (action, GPK_HARDWARE_DONT_PROMPT_ACTION)) {
+	} else if (g_strcmp0 (action, GPK_HARDWARE_DONT_PROMPT_ACTION) == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_ENABLE_CHECK_HARDWARE);
 		gconf_client_set_bool (hardware->priv->gconf_client, GPK_CONF_ENABLE_CHECK_HARDWARE, FALSE, NULL);
 	} else {
diff --git a/src/gpk-log.c b/src/gpk-log.c
index 82bbb1d..c66660e 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -478,16 +478,16 @@ gpk_log_add_obj (const PkTransactionObj *obj)
 	}
 
 	/* get nice name for tool name */
-	if (egg_strequal (obj->cmdline, "pkcon"))
+	if (g_strcmp0 (obj->cmdline, "pkcon") == 0)
 		/* TRANSLATORS: short name for pkcon */
 		tool = _("Command line client");
-	else if (egg_strequal (obj->cmdline, "gpk-application"))
+	else if (g_strcmp0 (obj->cmdline, "gpk-application") == 0)
 		/* TRANSLATORS: short name for gpk-update-viewer */
 		tool = _("Add/Remove Software");
-	else if (egg_strequal (obj->cmdline, "gpk-update-viewer"))
+	else if (g_strcmp0 (obj->cmdline, "gpk-update-viewer") == 0)
 		/* TRANSLATORS: short name for gpk-update-viewer */
 		tool = _("Update System");
-	else if (egg_strequal (obj->cmdline, "gpk-update-icon"))
+	else if (g_strcmp0 (obj->cmdline, "gpk-update-icon") == 0)
 		/* TRANSLATORS: short name for gpk-update-icon */
 		tool = _("Update Icon");
 	else
diff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c
index 21b4958..80d3981 100644
--- a/src/gpk-service-pack.c
+++ b/src/gpk-service-pack.c
@@ -710,13 +710,13 @@ main (int argc, char *argv[])
 
 	/* if command line arguments are set, then setup UI */
 	if (option != NULL) {
-		if (egg_strequal (option, "list")) {
+		if (g_strcmp0 (option, "list") == 0) {
 			widget = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_copy"));
 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-		} else if (egg_strequal (option, "updates")) {
+		} else if (g_strcmp0 (option, "updates") == 0) {
 			widget = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_updates"));
 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-		} else if (egg_strequal (option, "package")) {
+		} else if (g_strcmp0 (option, "package") == 0) {
 			widget = GTK_WIDGET (gtk_builder_get_object (builder, "radiobutton_package"));
 			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
 		}
diff --git a/src/gpk-vendor.c b/src/gpk-vendor.c
index f48a1e7..c79ddb4 100644
--- a/src/gpk-vendor.c
+++ b/src/gpk-vendor.c
@@ -81,7 +81,7 @@ gpk_vendor_get_not_found_url (GpkVendor *vendor, GpkVendorUrlType type)
 	url = g_key_file_get_string (vendor->priv->file, "PackagesNotFound", key, NULL);
 
 	/* none is a special value */
-	if (egg_strequal (url, "none")) {
+	if (g_strcmp0 (url, "none") == 0) {
 		g_free (url);
 		url = NULL;
 	}
@@ -100,7 +100,7 @@ gpk_vendor_get_not_found_url (GpkVendor *vendor, GpkVendorUrlType type)
 	url = g_key_file_get_string (vendor->priv->file, "PackagesNotFound", key, NULL);
 
 	/* none is a special value */
-	if (egg_strequal (url, "none")) {
+	if (g_strcmp0 (url, "none") == 0) {
 		g_free (url);
 		url = NULL;
 	}
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 7b66165..ba0cdfc 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -408,11 +408,11 @@ gpk_watch_libnotify_cb (NotifyNotification *notification, gchar *action, gpointe
 {
 	GpkWatch *watch = GPK_WATCH (data);
 
-	if (egg_strequal (action, "do-not-show-notify-complete")) {
+	if (g_strcmp0 (action, "do-not-show-notify-complete") == 0) {
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_COMPLETED);
 		gconf_client_set_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, FALSE, NULL);
 
-	} else if (egg_strequal (action, "show-error-details")) {
+	} else if (g_strcmp0 (action, "show-error-details") == 0) {
 		/* TRANSLATORS: The detailed error if the user clicks "more info" */
 		gpk_error_dialog (_("Error details"), _("Package manager error details"), watch->priv->error_details);
 
@@ -1388,7 +1388,7 @@ gpk_watch_get_proxy_ftp (GpkWatch *watch)
 
 	/* common case, a direct connection */
 	mode = gconf_client_get_string (watch->priv->gconf_client, "/system/proxy/mode", NULL);
-	if (egg_strequal (mode, "none")) {
+	if (g_strcmp0 (mode, "none") == 0) {
 		egg_debug ("not using session proxy");
 		goto out;
 	}
@@ -1430,7 +1430,7 @@ gpk_watch_get_proxy_http (GpkWatch *watch)
 
 	/* common case, a direct connection */
 	mode = gconf_client_get_string (watch->priv->gconf_client, "/system/proxy/mode", NULL);
-	if (egg_strequal (mode, "none")) {
+	if (g_strcmp0 (mode, "none") == 0) {
 		egg_debug ("not using session proxy");
 		goto out;
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]