aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/e-config-upgrade.c8
-rw-r--r--shell/e-config-upgrade.h2
-rw-r--r--shell/e-shell-importer.c30
-rw-r--r--shell/e-shell-switcher.c4
-rw-r--r--shell/es-event.c10
-rw-r--r--shell/es-event.h16
-rw-r--r--shell/main.c12
7 files changed, 41 insertions, 41 deletions
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 9aa71d3278..a933972b9b 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -132,12 +132,12 @@ static e_gconf_map_list_t remap_list[] = {
{ NULL },
};
-int
-e_config_upgrade(int major, int minor, int revision)
+gint
+e_config_upgrade(gint major, gint minor, gint revision)
{
xmlDocPtr config_doc;
- char *conf_file;
- int res = 0;
+ gchar *conf_file;
+ gint res = 0;
conf_file = g_build_filename (g_get_home_dir (), "evolution", "config.xmldb", NULL);
config_doc = e_xml_parse_file (conf_file);
diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h
index f4580425bd..36901109d7 100644
--- a/shell/e-config-upgrade.h
+++ b/shell/e-config-upgrade.h
@@ -24,6 +24,6 @@
#ifndef _E_CONFIG_UPGRADE_H
#define _E_CONFIG_UPGRADE_H
-int e_config_upgrade (int major, int minor, int revision);
+gint e_config_upgrade (gint major, gint minor, gint revision);
#endif /* _E_CONFIG_UPGRADE_H */
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 84d5d64877..b87da837ca 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -146,10 +146,10 @@ static struct {
#define num_info (sizeof (info) / sizeof (info[0]))
static GtkWidget *
-create_help (const char *name)
+create_help (const gchar *name)
{
GtkWidget *label;
- int i;
+ gint i;
for (i = 0; i < num_info; i++) {
if (!strcmp (name, info[i].name))
@@ -174,8 +174,8 @@ filename_changed (GtkWidget *widget,
ImportData *data)
{
ImportDialogFilePage *page;
- const char *filename;
- int fileok;
+ const gchar *filename;
+ gint fileok;
page = data->filepage;
@@ -188,7 +188,7 @@ filename_changed (GtkWidget *widget,
gboolean valid;
GSList *l;
EImportImporter *first = NULL;
- int i=0, firstitem=0;
+ gint i=0, firstitem=0;
g_free(page->target->uri_src);
page->target->uri_src = g_filename_to_uri(filename, NULL, NULL);
@@ -257,7 +257,7 @@ importer_file_page_new (ImportData *data)
GtkWidget *table, *label;
GtkCellRenderer *cell;
GtkListStore *store;
- int row = 0;
+ gint row = 0;
page = g_new0 (ImportDialogFilePage, 1);
@@ -366,7 +366,7 @@ prepare_intelligent_page (GnomeDruidPage *dpage,
{
GSList *l;
GtkWidget *table;
- int row;
+ gint row;
ImportDialogImporterPage *page = data->importerpage;
if (page->target != NULL)
@@ -388,7 +388,7 @@ prepare_intelligent_page (GnomeDruidPage *dpage,
row = 0;
for (;l;l=l->next) {
EImportImporter *eii = l->data;
- char *str;
+ gchar *str;
GtkWidget *w, *label;
w = e_import_get_widget(data->import, (EImportTarget *)page->target, eii);
@@ -432,7 +432,7 @@ import_druid_esc (GnomeDruid *druid,
}
static void
-import_druid_weak_notify (void *blah,
+import_druid_weak_notify (gpointer blah,
GObject *where_the_object_was)
{
ImportData *data = (ImportData *) blah;
@@ -451,7 +451,7 @@ import_druid_weak_notify (void *blah,
}
static void
-import_status(EImport *import, const char *what, int pc, void *d)
+import_status(EImport *import, const gchar *what, gint pc, gpointer d)
{
ImportData *data = d;
@@ -467,7 +467,7 @@ import_dialog_response(GtkDialog *d, guint button, ImportData *data)
}
static void
-import_done(EImport *ei, void *d)
+import_done(EImport *ei, gpointer d)
{
ImportData *data = d;
@@ -476,7 +476,7 @@ import_done(EImport *ei, void *d)
}
static void
-import_intelligent_done(EImport *ei, void *d)
+import_intelligent_done(EImport *ei, gpointer d)
{
ImportData *data = d;
@@ -495,7 +495,7 @@ import_druid_finish (GnomeDruidPage *page,
ImportData *data)
{
EImportCompleteFunc done = NULL;
- char *msg = NULL;
+ gchar *msg = NULL;
if (gtk_toggle_button_get_active((GtkToggleButton *)data->typepage->intelligent)) {
data->importerpage->current = data->importerpage->importers;
@@ -653,7 +653,7 @@ back_intelligent_page (GnomeDruidPage *page,
}
static void
-dialog_weak_notify (void *data,
+dialog_weak_notify (gpointer data,
GObject *where_the_dialog_was)
{
gboolean *dialog_open = (gboolean *) data;
@@ -668,7 +668,7 @@ e_shell_importer_start_import (EShellWindow *shell_window)
GtkWidget *html;
static gboolean dialog_open = FALSE;
GdkPixbuf *icon;
- char *gladefile;
+ gchar *gladefile;
if (dialog_open) {
return;
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 2944aace0e..e1ed8606e5 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -57,7 +57,7 @@ static gint
shell_switcher_layout_actions (EShellSwitcher *switcher)
{
GtkAllocation *allocation;
- int num_btns = g_list_length (switcher->priv->proxies), btns_per_row;
+ gint num_btns = g_list_length (switcher->priv->proxies), btns_per_row;
GList **rows, *p;
gboolean icons_only;
gint row_number;
@@ -121,7 +121,7 @@ shell_switcher_layout_actions (EShellSwitcher *switcher)
/* Layout the buttons. */
for (i = row_last; i >= 0; i--) {
- int len, extra_width;
+ gint len, extra_width;
x = H_PADDING + allocation->x;
y -= max_height;
diff --git a/shell/es-event.c b/shell/es-event.c
index e0ebb45d29..0533b92fec 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -121,7 +121,7 @@ es_event_target_new (ESEvent *eme)
}
ESEventTargetState *
-es_event_target_new_state(ESEvent *eme, int state)
+es_event_target_new_state(ESEvent *eme, gint state)
{
ESEventTargetState *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_STATE, sizeof(*t));
guint32 mask = ~0;
@@ -139,7 +139,7 @@ es_event_target_new_state(ESEvent *eme, int state)
}
ESEventTargetUpgrade *
-es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision)
+es_event_target_new_upgrade(ESEvent *eme, gint major, gint minor, gint revision)
{
ESEventTargetUpgrade *t = e_event_target_new(&eme->event, ES_EVENT_TARGET_UPGRADE, sizeof(*t));
@@ -151,7 +151,7 @@ es_event_target_new_upgrade(ESEvent *eme, int major, int minor, int revision)
}
ESEventTargetComponent *
-es_event_target_new_component (ESEvent *eme, const char *id)
+es_event_target_new_component (ESEvent *eme, const gchar *id)
{
ESEventTargetComponent *t = e_event_target_new (&eme->event, ES_EVENT_TARGET_COMPONENT, sizeof (*t));
@@ -162,7 +162,7 @@ es_event_target_new_component (ESEvent *eme, const char *id)
/* ********************************************************************** */
-static void *emeh_parent_class;
+static gpointer emeh_parent_class;
#define emeh ((ESEventHook *)eph)
static const EEventHookTargetMask emeh_state_masks[] = {
@@ -190,7 +190,7 @@ emeh_finalise(GObject *o)
static void
emeh_class_init(EPluginHookClass *klass)
{
- int i;
+ gint i;
/** @HookClass: Shell Main Menu
* @Id: org.gnome.evolution.shell.events:1.0
diff --git a/shell/es-event.h b/shell/es-event.h
index a23cb99b4f..7bb9fcd781 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -59,21 +59,21 @@ struct _ESEventTargetShell {
struct _ESEventTargetState {
EEventTarget target;
- int state;
+ gint state;
};
struct _ESEventTargetUpgrade {
EEventTarget target;
- int major;
- int minor;
- int revision;
+ gint major;
+ gint minor;
+ gint revision;
};
struct _ESEventTargetComponent {
EEventTarget target;
- const char *id;
+ const gchar *id;
};
typedef struct _EEventItem ESEventItem;
@@ -94,9 +94,9 @@ GType es_event_get_type(void);
ESEvent *es_event_peek(void);
ESEventTargetShell *es_event_target_new(ESEvent *eme);
-ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
-ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
-ESEventTargetComponent *es_event_target_new_component(ESEvent *eme, const char *id);
+ESEventTargetState *es_event_target_new_state(ESEvent *emp, gint state);
+ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, gint major, gint minor, gint revision);
+ESEventTargetComponent *es_event_target_new_component(ESEvent *eme, const gchar *id);
/* ********************************************************************** */
diff --git a/shell/main.c b/shell/main.c
index 928a321e61..6cb7d7c255 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -213,7 +213,7 @@ show_development_warning(void)
GtkWidget *checkbox;
GtkWidget *alignment;
gboolean skip;
- char *text;
+ gchar *text;
warning_dialog = gtk_dialog_new ();
gtk_window_set_title (GTK_WINDOW (warning_dialog), "Evolution " VERSION);
@@ -347,7 +347,7 @@ static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT;
static pthread_t main_thread;
static void
-segv_redirect (int sig)
+segv_redirect (gint sig)
{
if (pthread_self () == main_thread)
gnome_segv_handler (sig);
@@ -531,7 +531,7 @@ slowly_and_stupidly_obtain_timestamp (GdkDisplay *display)
name = "Fake Window";
XChangeProperty (
xdisplay, xwindow, atom_name, atom_type,
- 8, PropModeReplace, (unsigned char *) name,
+ 8, PropModeReplace, (guchar *) name,
strlen (name));
XWindowEvent (
@@ -634,8 +634,8 @@ create_default_shell (void)
default_shell = shell;
}
-int
-main (int argc, char **argv)
+gint
+main (gint argc, gchar **argv)
{
#ifdef G_OS_WIN32
extern void link_shutdown (void);
@@ -711,7 +711,7 @@ main (int argc, char **argv)
setup_segv_redirect ();
if (evolution_debug_log) {
- int fd;
+ gint fd;
fd = g_open (evolution_debug_log, O_WRONLY | O_CREAT | O_TRUNC, 0600);
if (fd != -1) {
generated by cgit (git 2.34.1) at 2024-11-12 00:02:49 +0800