[gnome-pilot] Replace g_file_exsits() with g_file_test(), replace g_concat_dir_and_file() with g_build_filename().



commit 9c4630431dca87beb7a0edc0970e1dff13a030bc
Author: Halton Huo <halton huo sun com>
Date:   Wed Aug 26 11:01:43 2009 +0800

    Replace g_file_exsits() with g_file_test(), replace g_concat_dir_and_file() with g_build_filename().

 applet/pilot.c              |    9 +++++----
 capplet/gnome-pilot-druid.c |    3 +--
 capplet/util.c              |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/applet/pilot.c b/applet/pilot.c
index acf8f34..b851514 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -29,7 +29,6 @@
 #include <errno.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
-#include <libgnome/gnome-util.h>
 #include <panel-applet-gconf.h>
 
 #include <signal.h>
@@ -1394,10 +1393,12 @@ pilot_applet_fill (PanelApplet *applet)
 	/* initialize glade */
 	glade_gnome_init ();
 	self->glade_file="./pilot-applet.glade";
-	if (!g_file_exists (self->glade_file)) {
-		self->glade_file = g_concat_dir_and_file (GLADEDATADIR, "pilot-applet.glade");
+	if (!g_file_test (self->glade_file, G_FILE_TEST_EXISTS)) {
+		self->glade_file = g_build_filename (GLADEDATADIR,
+						     "pilot-applet.glade",
+						     NULL);
 	}
-	if (!g_file_exists (self->glade_file)) {
+	if (!g_file_test (self->glade_file, G_FILE_TEST_EXISTS)) {
 		show_dialog (self, GTK_MESSAGE_ERROR,
 		    _("Cannot find pilot-applet.glade"));
 		return -1;
diff --git a/capplet/gnome-pilot-druid.c b/capplet/gnome-pilot-druid.c
index 390cad8..826cfc9 100644
--- a/capplet/gnome-pilot-druid.c
+++ b/capplet/gnome-pilot-druid.c
@@ -32,7 +32,6 @@
 #endif
 
 #include <glade/glade.h>
-#include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-druid.h>
 #include "pilot.h"
@@ -442,7 +441,7 @@ fill_widgets (GnomePilotDruid *gpd)
 	str = next_pilot_name (priv->state);
 	gtk_entry_set_text (GTK_ENTRY (priv->pilot_name), str);
 	
-	str2 = g_concat_dir_and_file (g_get_home_dir (), str);
+	str2 = g_build_filename (g_get_home_dir (), str, NULL);
 	gtk_entry_set_text (GTK_ENTRY (priv->pilot_basedir), str2);
 #ifndef PILOT_LINK_0_12
 	gtk_widget_set_sensitive(priv->pilot_charset_label, FALSE);
diff --git a/capplet/util.c b/capplet/util.c
index deaae1a..56aa8f8 100644
--- a/capplet/util.c
+++ b/capplet/util.c
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <ctype.h>
 #include <glade/glade.h>
-#include <libgnome/gnome-util.h>
 #include <errno.h>
 #include "util.h"
 #include <iconv.h>
@@ -253,7 +252,8 @@ get_default_pilot (PilotState *state)
 	pilot->pilot_username = g_strdup(g_get_real_name ());
 	pilot->pilot_id = getuid ();
 	pilot->name = next_pilot_name (state);
-	pilot->sync_options.basedir = g_concat_dir_and_file (g_get_home_dir (), pilot->name);
+	pilot->sync_options.basedir = g_build_filename (g_get_home_dir (),
+							pilot->name, NULL);
 #ifdef PILOT_LINK_0_12
 	pilot->pilot_charset =
 	    g_strdup(get_default_pilot_charset());



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]