GNOME.org
 

[gnome-pilot] Remove a few more deprecated Glib symbols. #594214

commit 5c49ede7cefc67f54b5312c2632580dd09f5dba6
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Mon Feb 1 22:39:22 2010 +0000

    Remove a few more deprecated Glib symbols. #594214

 ChangeLog                                  |    4 ++++
 applet/pilot.c                             |    8 ++++----
 conduits/backup/backup_conduit.c           |   11 +++++++----
 gpilotd/gnome-pilot-conduit-config.gob     |    2 +-
 gpilotd/gnome-pilot-conduit-management.gob |   20 ++++++++++----------
 gpilotd/gpilotd.c                          |    6 +++---
 gpilotd/orbit_daemon_glue.c                |    2 +-
 gpilotd/queue_io.c                         |   17 +++++++++--------
 utils/gpilotd-client.c                     |    2 +-
 9 files changed, 40 insertions(+), 32 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 596c80a..4a5254f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-01 Matt Davey <mcdavey mrao cam ac uk>
+	* removed a few more deprecated Glib symbols.
+		#594214, with thanks to Javier Jardon.
+
 2009-10-26 Matt Davey <mcdavey mrao cam ac uk>
 	* removed gnome-vfs from gnome-pilot-client.  Still involved via libgnome
 		pkgconfig.  Also, removed obsolete gnome-pilot.spec
diff --git a/applet/pilot.c b/applet/pilot.c
index 05e8f18..6df18e7 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -357,7 +357,7 @@ gpilotd_conduit_progress (GnomePilotClient* client,
 		gtk_progress_set_format_string (GTK_PROGRESS (applet->conduit_progress_bar), _("%v of %u records"));
 		gpilot_applet_progress_stop (applet->c_progress);
 	}
-	g_main_iteration (FALSE);
+	g_main_context_iteration (NULL, FALSE);
 }
 
 static void 
@@ -377,7 +377,7 @@ gpilotd_overall_progress (GnomePilotClient* client,
 	if (applet->properties.popups && applet->progressDialog!=NULL) {
 		gtk_progress_configure (GTK_PROGRESS (applet->overall_progress_bar),cur_f,0,tot_f);
 	}
-	g_main_iteration (FALSE);
+	g_main_context_iteration (NULL, FALSE);
 }
 
 static void 
@@ -394,7 +394,7 @@ gpilotd_conduit_message (GnomePilotClient* client,
 		g_free (txt);
 		gpilotd_scroll_to_insert_mark(applet);
 	}
-	g_main_iteration (FALSE);
+	g_main_context_iteration (NULL, FALSE);
 }
 
 static void 
@@ -411,7 +411,7 @@ gpilotd_daemon_message (GnomePilotClient* client,
 		g_free (txt);
 		gpilotd_scroll_to_insert_mark(applet);
 	}
-	g_main_iteration (FALSE);
+	g_main_context_iteration (NULL, FALSE);
 }
 
 static void 
diff --git a/conduits/backup/backup_conduit.c b/conduits/backup/backup_conduit.c
index deaa368..f017f90 100644
--- a/conduits/backup/backup_conduit.c
+++ b/conduits/backup/backup_conduit.c
@@ -267,13 +267,15 @@ destroy_configuration(ConduitCfg **c)
 		for (iterator = (*c)->files_in_backup; iterator; iterator = g_list_next (iterator)) {
 			gchar *filename = (char*)iterator->data;
 			gchar *backup_dirname;
+			gchar *basename;
 			gchar *backup_backup;
 			
 			/* I18N note: this is printed when renaming a file %s */
 			g_message (_("Renaming %s"), filename);
 
-			backup_dirname = g_dirname (filename);
-			backup_backup = g_strdup_printf ("%s/del/%s", backup_dirname, g_basename (filename));
+			backup_dirname = g_path_get_dirname (filename);
+			basename = g_path_get_basename (filename);
+			backup_backup = g_strdup_printf ("%s/del/%s", backup_dirname, basename);
 
 			/* I18N note: this message follow a "Renaming %s". The
 			   %s is a file name */
@@ -283,6 +285,7 @@ destroy_configuration(ConduitCfg **c)
 			}
 
 			g_free (backup_backup);
+			g_free (basename);
 			g_free (backup_dirname);
 			g_free (filename);
 		}
@@ -329,7 +332,7 @@ gnome_pilot_conduit_backup_remove_deleted (GnomePilotConduitBackup *conduit,
 		GList *iterator;
 		for (iterator = cfg->files_in_backup; iterator; iterator = g_list_next (iterator)) {
 			char *filename = (char*)iterator->data;
- 			if (filename && strcasecmp(filename, name) == 0) {
+			if (filename && g_ascii_strcasecmp (filename, name) == 0) {
 				cfg->files_in_backup = g_list_remove_link (cfg->files_in_backup, 
 									   iterator);
 				g_free (filename);
@@ -433,7 +436,7 @@ gnome_real_pilot_conduit_backup_backup (GnomePilotConduitBackup *conduit,
 	
 	/* let's see first if we should actually touch this db */
 	for (iterator = cfg->exclude_files; iterator; iterator = g_list_next (iterator)) {
-		if( ! g_strcasecmp(iterator->data, PI_DBINFO (dbinfo)->name) ) {
+		if(!g_ascii_strcasecmp (iterator->data, PI_DBINFO (dbinfo)->name)) {
 			g_message("excluded %s",PI_DBINFO (dbinfo)->name);
 			result = 2;
 			goto exit;
diff --git a/gpilotd/gnome-pilot-conduit-config.gob b/gpilotd/gnome-pilot-conduit-config.gob
index 1639b50..7acf8ee 100644
--- a/gpilotd/gnome-pilot-conduit-config.gob
+++ b/gpilotd/gnome-pilot-conduit-config.gob
@@ -357,7 +357,7 @@ class Gnome:Pilot:Conduit:Config from Gtk:Object {
 		conduit_name_copy = g_new0(char*,num_conduits);
 		num_conduits_copy = 0;
 		for(cnt=0;cnt<num_conduits;cnt++) {
-			if(g_strcasecmp(conduit_name[cnt],gnome_pilot_conduit_management_get_id(self->_priv->gpcm))) {
+			if (g_ascii_strcasecmp (conduit_name[cnt], gnome_pilot_conduit_management_get_id(self->_priv->gpcm))) {
 				/* g_message("keeping %d:%s",cnt,conduit_name[cnt]); */
 				conduit_name_copy[num_conduits_copy]=g_strdup(conduit_name[cnt]);
 				num_conduits_copy++;
diff --git a/gpilotd/gnome-pilot-conduit-management.gob b/gpilotd/gnome-pilot-conduit-management.gob
index 78ee4b1..2eab7a0 100644
--- a/gpilotd/gnome-pilot-conduit-management.gob
+++ b/gpilotd/gnome-pilot-conduit-management.gob
@@ -325,7 +325,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 	is_other_valid_tag (const gchar *s) {
 		gint i = 0;
 		for (i=0;valid_tags[i];i++)
-			if (g_strcasecmp (s,valid_tags[i])==0) return TRUE;
+			if (g_ascii_strcasecmp (s,valid_tags[i]) == 0) return TRUE;
 		return FALSE;
 		
 	}
@@ -338,7 +338,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		
 		version = xmlGetProp (root,(unsigned char *)"version");
 		/* g_message ("version = %s",version); */
-		if (version==NULL || g_strcasecmp ((char *) version, CONDUIT_XML_VERSION)!=0) {
+		if (version==NULL || g_ascii_strcasecmp ((char *) version, CONDUIT_XML_VERSION) != 0) {
 			g_warning ("incompatible version");
 			xmlFree (version);
 			return NULL;	
@@ -358,7 +358,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 
 		node = root->children;
 		/* until we find the "conduit" node */
-		while (node && g_strcasecmp ((char *) node->name,"conduit")!=0) {
+		while (node && g_ascii_strcasecmp ((char *) node->name,"conduit") != 0) {
 			node = node->next;
 		}
 		if (!node) {
@@ -390,7 +390,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 			return FALSE;
 		}
 
-		if (type && g_strcasecmp ((char *) type,"shlib")==0) {
+		if (type && g_ascii_strcasecmp ((char *) type,"shlib") == 0) {
 			obj->type = GNOME_PILOT_CONDUIT_TYPE_SHLIB;
 		} else {
 			g_warning ("Unknown conduit type");
@@ -429,7 +429,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		node = root->children;
 		/* until we find a name node */
 		while (node) {
-			while (node && g_strcasecmp ((char *) node->name,"name")) {
+			while (node && g_ascii_strcasecmp ((char *) node->name, "name")) {
 				node = node->next;
 			}
 			if (node) {
@@ -439,7 +439,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 				   is no current_name, set it. If on the
 				   other hand there is a lang, and it's the current, set it*/
 				if ((!lang && !current_name) ||
-				    (lang && g_strcasecmp ((char *) lang, self_get_lang ())==0)) {
+				    (lang && g_ascii_strcasecmp ((char *) lang, self_get_lang ()) == 0)) {
 					if (current_name) g_free (current_name);
 					current_name = g_strdup ((char *) value);
 				}
@@ -468,7 +468,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 
 		/* loop over the children */
 		for (node = root->children; node!=NULL; node=node->next) {
-			if (g_strcasecmp ((char *) node->name,"conduit-attribute")==0) {
+			if (g_ascii_strcasecmp ((char *) node->name, "conduit-attribute") == 0) {
 				xmlChar *lang,*name,*type,*value;
 				gchar *attr_with_lang;
 				
@@ -502,7 +502,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 					attr_with_lang = g_strdup ((char *) name);
 				}
 				/* if no type, assume string */
-				if (type==NULL || g_strcasecmp ((char *) type,"string")==0) {
+				if (type==NULL || g_ascii_strcasecmp ((char *) type, "string") == 0) {
 					g_hash_table_insert (obj->string_attributes,
 							     attr_with_lang,
 							     g_strdup ((char *) value));
@@ -514,7 +514,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 				xmlFree (name);
 				xmlFree (type);
 				xmlFree (value);
-			} else if (g_strcasecmp ((char *) node->name, "text") == 0) {
+			} else if (g_ascii_strcasecmp ((char *) node->name, "text") == 0) {
 				/* ignore text */
 			} else if (!self_is_other_valid_tag ((const gchar *)node->name)) { 
 				g_warning ("node->name = \"%s\", unhandled ",node->name);
@@ -542,7 +542,7 @@ class Gnome:Pilot:Conduit:Management from Gtk:Object {
 		root = xmlDocGetRootElement (doc);
 		if (!root ||
 		    !root->name ||
-		    g_strcasecmp ((char *) root->name,"gnome-pilot-conduit")!=0) {
+		    g_ascii_strcasecmp ((char *) root->name, "gnome-pilot-conduit") != 0) {
 			xmlFreeDoc (doc);
 			return NULL;
 		}      
diff --git a/gpilotd/gpilotd.c b/gpilotd/gpilotd.c
index d484ec2..68a1bb6 100644
--- a/gpilotd/gpilotd.c
+++ b/gpilotd/gpilotd.c
@@ -739,7 +739,7 @@ gpilot_syncing_known_pilot (GPilotPilot *pilot,
 			char *pwd;
 			
 			pwd = g_strndup (pu.password, pu.passwordLength);
-			if (g_strcasecmp (pilot->passwd, crypt (pwd, pilot->passwd))) {
+			if (g_ascii_strcasecmp (pilot->passwd, crypt (pwd, pilot->passwd)) != 0) {
 				pwd_ok = FALSE;
 				gpilot_gui_warning_dialog (_("Unknown PDA - no PDA matches ID %ld\n"
 							     "Use gpilotd-control-applet to set PDA's ID"), pu.userID);
@@ -1609,7 +1609,7 @@ write_pid_file (void)
 
 /*  
     The main loop. Sets up monitors for the devices and calls
-    g_main_iteration to wait for a sync. The monitor handler handles
+    g_main_context_iteration to wait for a sync. The monitor handler handles
     the sync, so look in device_in for the call to the actual sync.
 
     If reread_config gets set to TRUE (by a SIGHUP signal, free
@@ -1635,7 +1635,7 @@ wait_for_sync_and_sync (void)
 			g_list_foreach (context->devices, (GFunc)monitor_channel, context);
 		}
 		/* Enter the gtk main loop */
-		g_main_iteration (TRUE);
+		g_main_context_iteration (NULL, TRUE);
 	}
 }
 
diff --git a/gpilotd/orbit_daemon_glue.c b/gpilotd/orbit_daemon_glue.c
index ea7ff05..eca1bbe 100644
--- a/gpilotd/orbit_daemon_glue.c
+++ b/gpilotd/orbit_daemon_glue.c
@@ -1293,7 +1293,7 @@ match_pilot_and_name(const GPilotPilot *pilot,
 		     const gchar *name) 
 {
 	if(pilot) {
-		return g_strcasecmp(name,pilot->name);
+		return g_ascii_strcasecmp (name, pilot->name);
 	}
 	return -1;
 }
diff --git a/gpilotd/queue_io.c b/gpilotd/queue_io.c
index e9105ca..1a06ae7 100644
--- a/gpilotd/queue_io.c
+++ b/gpilotd/queue_io.c
@@ -105,13 +105,14 @@ static GPilotRequestType request_type_from_string(gchar *str) {
 		return GREQ_INVALID;
 	}
 
-	if(g_strcasecmp(str,"GREQ_INSTALL")==0) return GREQ_INSTALL;
-	if(g_strcasecmp(str,"GREQ_RESTORE")==0) return GREQ_RESTORE;
-	if(g_strcasecmp(str,"GREQ_CONDUIT")==0) return GREQ_CONDUIT;
-	if(g_strcasecmp(str,"GREQ_SET_USERINFO")==0) return GREQ_SET_USERINFO;
-	if(g_strcasecmp(str,"GREQ_GET_USERINFO")==0) return GREQ_GET_USERINFO;
-	if(g_strcasecmp(str,"GREQ_GET_SYSINFO")==0) return GREQ_GET_SYSINFO;
-	if(g_strcasecmp(str,"GREQ_NEW_USERINFO")==0) return GREQ_NEW_USERINFO;
+	if(g_ascii_strcasecmp (str,"GREQ_INSTALL") == 0) return GREQ_INSTALL;
+	if(g_ascii_strcasecmp (str,"GREQ_RESTORE") == 0) return GREQ_RESTORE;
+	if(g_ascii_strcasecmp (str,"GREQ_CONDUIT") == 0) return GREQ_CONDUIT;
+	if(g_ascii_strcasecmp (str,"GREQ_SET_USERINFO") == 0) return GREQ_SET_USERINFO;
+	if(g_ascii_strcasecmp (str,"GREQ_GET_USERINFO") == 0) return GREQ_GET_USERINFO;
+	if(g_ascii_strcasecmp (str,"GREQ_GET_SYSINFO") == 0) return GREQ_GET_SYSINFO;
+	if(g_ascii_strcasecmp (str,"GREQ_NEW_USERINFO") == 0) return GREQ_NEW_USERINFO;
+
 	return GREQ_INVALID;
 }
 
@@ -132,7 +133,7 @@ GList* gpc_queue_load_requests_for_cradle(gchar *cradle) {
 		req = NULL;;
 
 		req = (GPilotRequest*)it->data;
-		if(req && g_strcasecmp(req->cradle,cradle)==0) {
+		if(req && (g_ascii_strcasecmp (req->cradle,cradle) == 0)) {
 			retval = g_list_append(retval,req);
 		}
 		it = g_list_next(it);
diff --git a/utils/gpilotd-client.c b/utils/gpilotd-client.c
index 0a52c85..fa28445 100644
--- a/utils/gpilotd-client.c
+++ b/utils/gpilotd-client.c
@@ -126,7 +126,7 @@ system_info (GnomePilotClient *gpc,
 static void 
 the_loop (void) {
 	while (stay_alive) {
-		g_main_iteration (TRUE);
+		g_main_context_iteration (NULL, TRUE);
 	}
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]