aboutsummaryrefslogtreecommitdiffstats
path: root/shell/importer
diff options
context:
space:
mode:
Diffstat (limited to 'shell/importer')
-rw-r--r--shell/importer/evolution-importer-client.c10
-rw-r--r--shell/importer/evolution-importer-client.h8
-rw-r--r--shell/importer/evolution-importer-listener.c6
-rw-r--r--shell/importer/evolution-importer-listener.h4
-rw-r--r--shell/importer/evolution-importer.c6
-rw-r--r--shell/importer/evolution-importer.h16
-rw-r--r--shell/importer/evolution-intelligent-importer.c18
-rw-r--r--shell/importer/evolution-intelligent-importer.h10
-rw-r--r--shell/importer/intelligent.c32
9 files changed, 55 insertions, 55 deletions
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 06d30d5733..66a82836e3 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -92,7 +92,7 @@ evolution_importer_client_new (const CORBA_Object objref)
* Returns: A newly created EvolutionImporterClient.
*/
EvolutionImporterClient *
-evolution_importer_client_new_from_id (const char *id)
+evolution_importer_client_new_from_id (const gchar *id)
{
CORBA_Environment ev;
CORBA_Object objref;
@@ -100,7 +100,7 @@ evolution_importer_client_new_from_id (const char *id)
g_return_val_if_fail (id != NULL, NULL);
CORBA_exception_init (&ev);
- objref = bonobo_activation_activate_from_id ((char *) id, 0, NULL, &ev);
+ objref = bonobo_activation_activate_from_id ((gchar *) id, 0, NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
CORBA_exception_free (&ev);
g_warning ("Could not start %s.", id);
@@ -154,7 +154,7 @@ evolution_importer_client_create_control (EvolutionImporterClient *client)
*/
gboolean
evolution_importer_client_support_format (EvolutionImporterClient *client,
- const char *filename)
+ const gchar *filename)
{
GNOME_Evolution_Importer corba_importer;
gboolean result;
@@ -185,7 +185,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client,
* Returns: TRUE on sucess, FALSE on failure.
*/
gboolean
-evolution_importer_client_load_file (EvolutionImporterClient *client, const char *filename)
+evolution_importer_client_load_file (EvolutionImporterClient *client, const gchar *filename)
{
GNOME_Evolution_Importer corba_importer;
gboolean result;
@@ -248,7 +248,7 @@ evolution_importer_client_process_item (EvolutionImporterClient *client,
* Returns: The error as a string. If there is no error NULL is returned.
* Importers need not support this method and if so, NULL is also returned.
*/
-const char *
+const gchar *
evolution_importer_client_get_error (EvolutionImporterClient *client)
{
GNOME_Evolution_Importer corba_importer;
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 3ae4b2f7b0..2a71e58a45 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -56,16 +56,16 @@ struct _EvolutionImporterClientClass {
GType evolution_importer_client_get_type (void);
EvolutionImporterClient *evolution_importer_client_new (const CORBA_Object objref);
-EvolutionImporterClient *evolution_importer_client_new_from_id (const char *id);
+EvolutionImporterClient *evolution_importer_client_new_from_id (const gchar *id);
GtkWidget *evolution_importer_client_create_control (EvolutionImporterClient *client);
gboolean evolution_importer_client_support_format (EvolutionImporterClient *client,
- const char *filename);
+ const gchar *filename);
gboolean evolution_importer_client_load_file (EvolutionImporterClient *client,
- const char *filename);
+ const gchar *filename);
void evolution_importer_client_process_item (EvolutionImporterClient *client,
EvolutionImporterListener *listener);
-const char *evolution_importer_client_get_error (EvolutionImporterClient *client);
+const gchar *evolution_importer_client_get_error (EvolutionImporterClient *client);
#ifdef __cplusplus
}
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index 8915202d30..ffac2d3ab4 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -37,7 +37,7 @@ static BonoboObjectClass *parent_class = NULL;
struct _EvolutionImporterListenerPrivate {
EvolutionImporterListenerCallback callback;
- void *closure;
+ gpointer closure;
};
#if 0
@@ -185,7 +185,7 @@ evolution_importer_listener_init (EvolutionImporterListener *listener)
static void
evolution_importer_listener_construct (EvolutionImporterListener *listener,
EvolutionImporterListenerCallback callback,
- void *closure)
+ gpointer closure)
{
EvolutionImporterListenerPrivate *priv;
@@ -209,7 +209,7 @@ evolution_importer_listener_construct (EvolutionImporterListener *listener,
*/
EvolutionImporterListener *
evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
- void *closure)
+ gpointer closure)
{
EvolutionImporterListener *listener;
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index 63f480e4dd..e4df945271 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -46,7 +46,7 @@ typedef struct _EvolutionImporterListenerClass EvolutionImporterListenerClass;
typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *listener,
EvolutionImporterResult result,
gboolean more_items,
- void *closure);
+ gpointer closure);
struct _EvolutionImporterListener {
BonoboObject parent;
@@ -62,7 +62,7 @@ struct _EvolutionImporterListenerClass {
GType evolution_importer_listener_get_type (void);
EvolutionImporterListener *evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
- void *closure);
+ gpointer closure);
#ifdef __cplusplus
}
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index f8e6847891..26b06e7c20 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -41,7 +41,7 @@ struct _EvolutionImporterPrivate {
EvolutionImporterProcessItemFn process_item_fn;
EvolutionImporterGetErrorFn get_error_fn;
- void *closure;
+ gpointer closure;
};
@@ -194,7 +194,7 @@ evolution_importer_construct (EvolutionImporter *importer,
EvolutionImporterLoadFileFn load_file_fn,
EvolutionImporterProcessItemFn process_item_fn,
EvolutionImporterGetErrorFn get_error_fn,
- void *closure)
+ gpointer closure)
{
EvolutionImporterPrivate *priv;
@@ -233,7 +233,7 @@ evolution_importer_new (EvolutionImporterCreateControlFn create_control_fn,
EvolutionImporterLoadFileFn load_file_fn,
EvolutionImporterProcessItemFn process_item_fn,
EvolutionImporterGetErrorFn get_error_fn,
- void *closure)
+ gpointer closure)
{
EvolutionImporter *importer;
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 4925fad4fc..b4bf54928f 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -44,20 +44,20 @@ typedef struct _EvolutionImporterClass EvolutionImporterClass;
typedef void (* EvolutionImporterCreateControlFn) (EvolutionImporter *importer,
Bonobo_Control *control,
- void *closure);
+ gpointer closure);
typedef gboolean (* EvolutionImporterSupportFormatFn) (EvolutionImporter *importer,
- const char *filename,
- void *closure);
+ const gchar *filename,
+ gpointer closure);
typedef gboolean (* EvolutionImporterLoadFileFn) (EvolutionImporter *importer,
- const char *filename,
- void *closure);
+ const gchar *filename,
+ gpointer closure);
typedef void (* EvolutionImporterProcessItemFn) (EvolutionImporter *importer,
CORBA_Object listener,
- void *closure,
+ gpointer closure,
CORBA_Environment *ev);
-typedef char *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer,
- void *closure);
+typedef gchar *(* EvolutionImporterGetErrorFn) (EvolutionImporter *importer,
+ gpointer closure);
typedef enum {
EVOLUTION_IMPORTER_OK,
diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index d867c120b8..48c767cfde 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.c
@@ -37,9 +37,9 @@ struct _EvolutionIntelligentImporterPrivate {
EvolutionIntelligentImporterCanImportFn can_import_fn;
EvolutionIntelligentImporterImportDataFn import_data_fn;
- char *importername;
- char *message;
- void *closure;
+ gchar *importername;
+ gchar *message;
+ gpointer closure;
};
@@ -148,9 +148,9 @@ static void
evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii,
EvolutionIntelligentImporterCanImportFn can_import_fn,
EvolutionIntelligentImporterImportDataFn import_data_fn,
- const char *importername,
- const char *message,
- void *closure)
+ const gchar *importername,
+ const gchar *message,
+ gpointer closure)
{
g_return_if_fail (ii != NULL);
ii->priv->importername = g_strdup (importername);
@@ -178,9 +178,9 @@ evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii,
EvolutionIntelligentImporter *
evolution_intelligent_importer_new (EvolutionIntelligentImporterCanImportFn can_import_fn,
EvolutionIntelligentImporterImportDataFn import_data_fn,
- const char *importername,
- const char *message,
- void *closure)
+ const gchar *importername,
+ const gchar *message,
+ gpointer closure)
{
EvolutionIntelligentImporter *ii;
diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 2d36d498e9..99d5d2b26d 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.h
@@ -43,9 +43,9 @@ typedef struct _EvolutionIntelligentImporterPrivate EvolutionIntelligentImporter
typedef struct _EvolutionIntelligentImporterClass EvolutionIntelligentImporterClass;
typedef gboolean (* EvolutionIntelligentImporterCanImportFn) (EvolutionIntelligentImporter *ii,
- void *closure);
+ gpointer closure);
typedef void (* EvolutionIntelligentImporterImportDataFn) (EvolutionIntelligentImporter *ii,
- void *closure);
+ gpointer closure);
struct _EvolutionIntelligentImporter {
BonoboObject parent;
@@ -63,9 +63,9 @@ GType evolution_intelligent_importer_get_type (void);
EvolutionIntelligentImporter *evolution_intelligent_importer_new (EvolutionIntelligentImporterCanImportFn can_import_fn,
EvolutionIntelligentImporterImportDataFn import_data_fn,
- const char *importername,
- const char *message,
- void *closure);
+ const gchar *importername,
+ const gchar *message,
+ gpointer closure);
#ifdef __cplusplus
}
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 20927d2742..8b7ebaa743 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -48,9 +48,9 @@ typedef struct {
Bonobo_Control control;
GtkWidget *widget;
- char *name;
- char *blurb;
- char *iid;
+ gchar *name;
+ gchar *blurb;
+ gchar *iid;
} IntelligentImporterData;
typedef struct {
@@ -61,12 +61,12 @@ typedef struct {
GList *importers;
- int running;
+ gint running;
} IntelligentImporterDialog;
typedef struct {
CORBA_Object importer;
- char *iid;
+ gchar *iid;
} SelectedImporterData;
static void
@@ -119,7 +119,7 @@ get_intelligent_importers (void)
Bonobo_ServerInfoList *info_list;
GList *iids_ret = NULL;
CORBA_Environment ev;
- int i;
+ gint i;
CORBA_exception_init (&ev);
info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:" BASE_VERSION "')", NULL, &ev);
@@ -137,8 +137,8 @@ get_intelligent_importers (void)
static void
select_row_cb (GtkCList *clist,
- int row,
- int column,
+ gint row,
+ gint column,
GdkEvent *ev,
IntelligentImporterDialog *d)
{
@@ -147,8 +147,8 @@ select_row_cb (GtkCList *clist,
static void
unselect_row_cb (GtkCList *clist,
- int row,
- int column,
+ gint row,
+ gint column,
GdkEvent *ev,
IntelligentImporterDialog *d)
{
@@ -162,7 +162,7 @@ create_gui (GList *importers)
GtkWidget *hbox, *vbox, *dummy;
IntelligentImporterDialog *d;
GList *l;
- int running = 0;
+ gint running = 0;
d = g_new (IntelligentImporterDialog, 1);
d->dialog = dialog = gtk_dialog_new();
@@ -220,7 +220,7 @@ create_gui (GList *importers)
IntelligentImporterData *data;
CORBA_Environment ev;
gboolean dontaskagain, can_run;
- char *text[1], *prefix;
+ gchar *text[1], *prefix;
/* Check if we want to show this one again */
prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir ());
@@ -237,7 +237,7 @@ create_gui (GList *importers)
data->iid = g_strdup (l->data);
CORBA_exception_init (&ev);
- data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0,
+ data->object = bonobo_activation_activate_from_id ((gchar *) data->iid, 0,
NULL, &ev);
if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("Could not start %s: %s", data->iid,
@@ -359,9 +359,9 @@ intelligent_importer_init (void)
{
GList *importers, *l, *selected = NULL;
IntelligentImporterDialog *d;
- char *prefix;
+ gchar *prefix;
gboolean dontaskagain;
- int resp;
+ gint resp;
prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir());
gnome_config_push_prefix (prefix);
@@ -395,7 +395,7 @@ intelligent_importer_init (void)
IntelligentImporterData *data;
SelectedImporterData *new_data;
CORBA_Environment ev;
- char *iid;
+ gchar *iid;
data = g_list_nth_data (d->importers, GPOINTER_TO_INT (l->data));
iid = g_strdup (data->iid);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-13 11:01:48 +0800