org.guifications.plugins.autoprofile_merge: 258fb55196307bfeda2019760cf6285e179a2a07

[rekkanoryo at guifications.org]

-----------------------------------------------------------------
Revision: 258fb55196307bfeda2019760cf6285e179a2a07
Ancestor: 642739fdffc29c05067649282af9d51ccd16b177
Author: rekkanoryo at guifications.org
Date: 2008-03-24T01:20:54
Branch: org.guifications.plugins.autoprofile_merge

Modified files:
        autoprofile/comp_rss_parser.c autoprofile/comp_textfile.c

ChangeLog: 

Kill a few more warnings and errors.

-----------------------------------------------------------------
This revision's diffstat output:
 comp_rss_parser.c |    2 +-
 comp_textfile.c   |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
-------------- next part --------------
============================================================
--- autoprofile/comp_rss_parser.c	cebeaa10f659dbccf059d8dfa4eda8ec5333a2fe
+++ autoprofile/comp_rss_parser.c	a12893a6303e33c448170a6ece3e9d3985af555f
@@ -340,7 +340,7 @@ void parse_rss (struct widget *w)
 
   url = get_url (w);
   if (strcmp (url, "") != 0) {
-    purple_url_fetch (url, TRUE, NULL, FALSE, url_callback, w);
+    purple_util_fetch_url (url, TRUE, NULL, FALSE, url_callback, w);
   }
   free (url);
 }
============================================================
--- autoprofile/comp_textfile.c	a8a07313d34f0801130b7a09440252b2b6f08e88
+++ autoprofile/comp_textfile.c	06d251209af67204fb6f127e119531f667291457
@@ -21,8 +21,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA *
  *--------------------------------------------------------------------------*/
 
+#include "../common/pp_internal.h"
+
 #include "component.h"
 
+#include <string.h>
+
 /*---------- TEXT FILE: Text from a file ----------*/
 static GtkWidget *file_entry;
 static GtkWidget *file_selector;
@@ -38,11 +42,11 @@ char *text_file_generate (struct widget 
   filename = ap_prefs_get_string (w, "text_file");
 
   if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
-    return strdup (_("[ERROR: File does not exist]"));
+    return g_strdup (_("[ERROR: File does not exist]"));
   }
 
   if (!g_file_get_contents (filename, &text, NULL, NULL)) {
-    return strdup (_("[ERROR: Unable to open file]"));
+    return g_strdup (_("[ERROR: Unable to open file]"));
   } 
 
   converted = purple_utf8_try_convert (text);