aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/e-account-utils.c2
-rw-r--r--e-util/e-account-utils.h2
-rw-r--r--e-util/e-bconf-map.c2
-rw-r--r--e-util/e-bconf-map.h16
-rw-r--r--e-util/e-binding.c2
-rw-r--r--e-util/e-binding.h2
-rw-r--r--e-util/e-bit-array.c2
-rw-r--r--e-util/e-bit-array.h5
-rw-r--r--e-util/e-categories-config.c2
-rw-r--r--e-util/e-categories-config.h2
-rw-r--r--e-util/e-config-listener.c2
-rw-r--r--e-util/e-config-listener.h2
-rw-r--r--e-util/e-config.c2
-rw-r--r--e-util/e-config.h2
-rw-r--r--e-util/e-cursor.c2
-rw-r--r--e-util/e-cursor.h2
-rw-r--r--e-util/e-dialog-utils.c2
-rw-r--r--e-util/e-dialog-utils.h2
-rw-r--r--e-util/e-dialog-widgets.c2
-rw-r--r--e-util/e-dialog-widgets.h2
-rw-r--r--e-util/e-error.c62
-rw-r--r--e-util/e-error.h2
-rw-r--r--e-util/e-event.c2
-rw-r--r--e-util/e-event.h2
-rw-r--r--e-util/e-folder-map.c4
-rw-r--r--e-util/e-folder-map.h5
-rw-r--r--e-util/e-fsutils.c2
-rw-r--r--e-util/e-fsutils.h2
-rw-r--r--e-util/e-html-utils.c4
-rw-r--r--e-util/e-html-utils.h2
-rw-r--r--e-util/e-icon-factory.c2
-rw-r--r--e-util/e-icon-factory.h2
-rw-r--r--e-util/e-import.c2
-rw-r--r--e-util/e-import.h2
-rw-r--r--e-util/e-logger.c6
-rw-r--r--e-util/e-logger.h2
-rw-r--r--e-util/e-marshal.list1
-rw-r--r--e-util/e-menu.c2
-rw-r--r--e-util/e-menu.h2
-rw-r--r--e-util/e-mktemp.c2
-rw-r--r--e-util/e-mktemp.h2
-rw-r--r--e-util/e-module.c2
-rw-r--r--e-util/e-module.h2
-rw-r--r--e-util/e-non-intrusive-error-dialog.c2
-rw-r--r--e-util/e-non-intrusive-error-dialog.h8
-rw-r--r--e-util/e-pilot-map.c2
-rw-r--r--e-util/e-pilot-map.h2
-rw-r--r--e-util/e-pilot-util.c2
-rw-r--r--e-util/e-pilot-util.h2
-rw-r--r--e-util/e-plugin-ui.c4
-rw-r--r--e-util/e-plugin-ui.h2
-rw-r--r--e-util/e-plugin.c4
-rw-r--r--e-util/e-plugin.h6
-rw-r--r--e-util/e-popup.c2
-rw-r--r--e-util/e-popup.h2
-rw-r--r--e-util/e-print.c2
-rw-r--r--e-util/e-print.h2
-rw-r--r--e-util/e-profile-event.c2
-rw-r--r--e-util/e-profile-event.h2
-rw-r--r--e-util/e-request.c2
-rw-r--r--e-util/e-request.h2
-rw-r--r--e-util/e-signature-list.c2
-rw-r--r--e-util/e-signature-list.h2
-rw-r--r--e-util/e-signature-utils.c2
-rw-r--r--e-util/e-signature-utils.h2
-rw-r--r--e-util/e-signature.c2
-rw-r--r--e-util/e-signature.h2
-rw-r--r--e-util/e-sorter-array.c2
-rw-r--r--e-util/e-sorter-array.h2
-rw-r--r--e-util/e-sorter.c2
-rw-r--r--e-util/e-sorter.h2
-rw-r--r--e-util/e-text-event-processor-emacs-like.c4
-rw-r--r--e-util/e-text-event-processor-emacs-like.h2
-rw-r--r--e-util/e-text-event-processor-types.h8
-rw-r--r--e-util/e-text-event-processor.c5
-rw-r--r--e-util/e-text-event-processor.h2
-rw-r--r--e-util/e-unicode.c6
-rw-r--r--e-util/e-unicode.h3
-rw-r--r--e-util/e-util-private.h2
-rw-r--r--e-util/e-util.c8
-rw-r--r--e-util/e-util.h12
-rw-r--r--e-util/e-win32-reloc.c2
-rw-r--r--e-util/e-xml-utils.c2
-rw-r--r--e-util/e-xml-utils.h4
-rw-r--r--e-util/gconf-bridge.c43
-rw-r--r--e-util/gconf-bridge.h6
86 files changed, 167 insertions, 185 deletions
diff --git a/e-util/e-account-utils.c b/e-util/e-account-utils.c
index d98a378b48..5fdffd8be2 100644
--- a/e-util/e-account-utils.c
+++ b/e-util/e-account-utils.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/e-util/e-account-utils.h b/e-util/e-account-utils.h
index 24262349d2..f2ae8fc5dc 100644
--- a/e-util/e-account-utils.h
+++ b/e-util/e-account-utils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 7d874b896b..9f97a441db 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index 1d72119c8c..8c6ea6deec 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -45,9 +45,9 @@ enum {
};
typedef struct _e_bconf_map {
- char *from;
- char *to;
- int type;
+ const gchar *from;
+ const gchar *to;
+ gint type;
struct _e_bconf_map *child;
} e_bconf_map_t;
@@ -83,13 +83,13 @@ enum {
};
typedef struct {
- char *from;
- char *to;
- int type;
+ const gchar *from;
+ const gchar *to;
+ gint type;
} e_gconf_map_t;
typedef struct {
- char *root;
+ const gchar *root;
e_gconf_map_t *map;
} e_gconf_map_list_t;
diff --git a/e-util/e-binding.c b/e-util/e-binding.c
index 6a29166cc1..9d4e83fc3f 100644
--- a/e-util/e-binding.c
+++ b/e-util/e-binding.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-binding.h b/e-util/e-binding.h
index 676093bfad..12f4db8505 100644
--- a/e-util/e-binding.h
+++ b/e-util/e-binding.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index fdd3d3fe01..e2cf15af43 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index ea8ed89797..34c8016094 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -66,7 +66,7 @@ void e_bit_array_clear (EBitArray *selection);
gint e_bit_array_selected_count (EBitArray *selection);
void e_bit_array_select_all (EBitArray *selection);
void e_bit_array_invert_selection (EBitArray *selection);
-int e_bit_array_bit_count (EBitArray *selection);
+gint e_bit_array_bit_count (EBitArray *selection);
void e_bit_array_change_one_row (EBitArray *selection,
int row,
gboolean grow);
@@ -91,7 +91,6 @@ void e_bit_array_delete_single_mode (EBitArray *esm,
void e_bit_array_move_row (EBitArray *esm,
int old_row,
int new_row);
-gint e_bit_array_bit_count (EBitArray *esm);
gboolean e_bit_array_cross_and (EBitArray *esm);
gboolean e_bit_array_cross_or (EBitArray *esm);
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 875b67974f..c01b98cde4 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index 9eff161375..bbd76f2a02 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index 83fb305347..7c1c6eb091 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h
index 655bc3c1ec..4449d8f22c 100644
--- a/e-util/e-config-listener.h
+++ b/e-util/e-config-listener.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-config.c b/e-util/e-config.c
index a2d68e1740..5d0a7090f7 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-config.h b/e-util/e-config.h
index 1ee7e29b58..b128005c64 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c
index 7d547e38ac..c5f77c7d62 100644
--- a/e-util/e-cursor.c
+++ b/e-util/e-cursor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h
index f0b78b3126..30ad722bbc 100644
--- a/e-util/e-cursor.h
+++ b/e-util/e-cursor.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 7d1d4836b6..32a16a3b5b 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index 9e6e7992c1..6f25293f10 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index f1777ca55d..98e1be7a74 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index f5ff123a4f..b7f838539d 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 7c1248bb7b..f2067950bc 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -41,27 +41,27 @@
struct _e_error_button {
struct _e_error_button *next;
- char *stock;
- char *label;
- int response;
+ const gchar *stock;
+ const gchar *label;
+ gint response;
};
struct _e_error {
guint32 flags;
- char *id;
- int type;
- int default_response;
- char *title;
- char *primary;
- char *secondary;
- char *help_uri;
+ const gchar *id;
+ gint type;
+ gint default_response;
+ const gchar *title;
+ const gchar *primary;
+ const gchar *secondary;
+ const gchar *help_uri;
gboolean scroll;
struct _e_error_button *buttons;
};
struct _e_error_table {
- char *domain;
- char *translation_domain;
+ const gchar *domain;
+ const gchar *translation_domain;
GHashTable *errors;
};
@@ -84,8 +84,8 @@ static struct _e_error default_errors[] = {
/* ********************************************************************** */
static struct {
- char *name;
- int id;
+ const gchar *name;
+ gint id;
} response_map[] = {
{ "GTK_RESPONSE_REJECT", GTK_RESPONSE_REJECT },
{ "GTK_RESPONSE_ACCEPT", GTK_RESPONSE_ACCEPT },
@@ -111,9 +111,9 @@ map_response(const char *name)
}
static struct {
- const char *name;
- const char *icon;
- const char *title;
+ const gchar *name;
+ const gchar *icon;
+ const gchar *title;
} type_map[] = {
{ "info", GTK_STOCK_DIALOG_INFO, N_("Evolution Information") },
{ "warning", GTK_STOCK_DIALOG_WARNING, N_("Evolution Warning") },
@@ -184,7 +184,7 @@ ee_load(const char *path)
table = g_malloc0(sizeof(*table));
table->domain = g_strdup(tmp);
table->errors = g_hash_table_new(g_str_hash, g_str_equal);
- g_hash_table_insert(error_table, table->domain, table);
+ g_hash_table_insert(error_table, (gpointer) table->domain, table);
tmp2 = (char *)xmlGetProp(root, (const unsigned char *)"translation-domain");
if (tmp2) {
@@ -263,16 +263,20 @@ ee_load(const char *path)
}
} else if (!strcmp((char *)scan->name, "button")) {
struct _e_error_button *b;
+ gchar *label = NULL;
+ gchar *stock = NULL;
b = g_malloc0(sizeof(*b));
tmp = (char *)xmlGetProp(scan, (const unsigned char *)"stock");
if (tmp) {
- b->stock = g_strdup(tmp);
+ stock = g_strdup(tmp);
+ b->stock = stock;
xmlFree(tmp);
}
tmp = (char *)xmlGetProp(scan, (const unsigned char *)"label");
if (tmp) {
- b->label = g_strdup(dgettext(table->translation_domain, tmp));
+ label = g_strdup(dgettext(table->translation_domain, tmp));
+ b->label = label;
xmlFree(tmp);
}
tmp = (char *)xmlGetProp(scan, (const unsigned char *)"response");
@@ -281,10 +285,10 @@ ee_load(const char *path)
xmlFree(tmp);
}
- if (b->stock == NULL && b->label == NULL) {
+ if (stock == NULL && label == NULL) {
g_warning("Error file '%s': missing button details in error '%s'", path, e->id);
- g_free(b->stock);
- g_free(b->label);
+ g_free(stock);
+ g_free(label);
g_free(b);
} else {
lastbutton->next = b;
@@ -293,7 +297,7 @@ ee_load(const char *path)
}
}
- g_hash_table_insert(table->errors, e->id, e);
+ g_hash_table_insert(table->errors, (gpointer) e->id, e);
}
}
@@ -319,8 +323,8 @@ ee_load_tables(void)
table->domain = "builtin";
table->errors = g_hash_table_new(g_str_hash, g_str_equal);
for (i=0;i<sizeof(default_errors)/sizeof(default_errors[0]);i++)
- g_hash_table_insert(table->errors, default_errors[i].id, &default_errors[i]);
- g_hash_table_insert(error_table, table->domain, table);
+ g_hash_table_insert(table->errors, (gpointer) default_errors[i].id, &default_errors[i]);
+ g_hash_table_insert(error_table, (gpointer) table->domain, table);
/* look for installed error tables */
base = g_build_filename (EVOLUTION_PRIVDATADIR, "errors", NULL);
@@ -525,7 +529,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
g_string_free (oerr, TRUE);
} else
perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog)));
-
+
if (e->secondary) {
ee_build_label(out, e->secondary, args, TRUE);
oerr = g_string_new("");
@@ -557,7 +561,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0);
g_object_set_data_full ((GObject *) dialog, "primary", perr, g_free);
g_object_set_data_full ((GObject *) dialog, "secondary", serr, g_free);
-
+
return (GtkWidget *)dialog;
}
diff --git a/e-util/e-error.h b/e-util/e-error.h
index 321957839f..014f74ee88 100644
--- a/e-util/e-error.h
+++ b/e-util/e-error.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 73111229f9..ab96701abc 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-event.h b/e-util/e-event.h
index c97f1b30bc..5b4e3f44ab 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 3475d61a70..d74817ecfe 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -150,7 +150,7 @@ e_folder_map_dir (const char *dirname, const char *type, GSList **dir_list)
}
GSList *
-e_folder_map_local_folders (char *local_dir, char *type)
+e_folder_map_local_folders (const gchar *local_dir, const gchar *type)
{
const char *name;
GDir *dir;
diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h
index e61dc140ff..3f41838882 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-folder-map.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -28,7 +28,8 @@
G_BEGIN_DECLS
-GSList *e_folder_map_local_folders (char *local_dir, char *type);
+GSList * e_folder_map_local_folders (const gchar *local_dir,
+ const gchar *type);
G_END_DECLS
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index 28b434f291..27480959c4 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h
index 91ad9b9c4a..76a03f5441 100644
--- a/e-util/e-fsutils.h
+++ b/e-util/e-fsutils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index d634f5f6b0..4958f0806e 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -246,7 +246,7 @@ e_text_to_html_full (const char *input, unsigned int flags, guint32 color)
colored = TRUE;
}
} else if (colored) {
- gchar *no_font = "</FONT>";
+ const gchar *no_font = "</FONT>";
out = check_size (&buffer, &buffer_size, out, 9);
out += sprintf (out, "%s", no_font);
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index fa70e55f7f..55e67ba915 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 299dfff6f5..5b1cd2f9bd 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index c864b1be8e..b8a4df972f 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 9e8c8a3fa7..ccc44d7daa 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 9a9994150b..4ca1ef1829 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 97d27d03cf..6c391efb3b 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -243,7 +243,7 @@ e_logger_log (ELogger *logger,
logger_set_dirty (logger);
}
-void
+void
e_logger_get_logs (ELogger *logger,
ELogFunction func,
gpointer user_data)
@@ -256,7 +256,7 @@ e_logger_get_logs (ELogger *logger,
/* Flush everything before we get the logs */
if (logger->priv->fp)
- fflush (logger->priv->fp);
+ fflush (logger->priv->fp);
fp = g_fopen (logger->priv->logfile, "r");
if (!fp) {
diff --git a/e-util/e-logger.h b/e-util/e-logger.h
index ce595d691c..efb5cd47f1 100644
--- a/e-util/e-logger.h
+++ b/e-util/e-logger.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list
index b667ca4a84..d6a3f0cb55 100644
--- a/e-util/e-marshal.list
+++ b/e-util/e-marshal.list
@@ -67,3 +67,4 @@ NONE:STRING,STRING,UINT
OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
POINTER:NONE
STRING:NONE
+
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index cfbb215712..e5472d6bbc 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index f844f80400..5df8f11b28 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index ade1abc0b4..682563907c 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h
index 48e72235ee..01dbd18119 100644
--- a/e-util/e-mktemp.h
+++ b/e-util/e-mktemp.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-module.c b/e-util/e-module.c
index 51e1e18bd6..3919841910 100644
--- a/e-util/e-module.c
+++ b/e-util/e-module.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-module.h b/e-util/e-module.h
index 022769dc1c..a8120563d3 100644
--- a/e-util/e-module.h
+++ b/e-util/e-module.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c
index 5fd98cacd2..930cd4b814 100644
--- a/e-util/e-non-intrusive-error-dialog.c
+++ b/e-util/e-non-intrusive-error-dialog.c
@@ -169,7 +169,7 @@ eni_error_level_value_changed (GtkComboBox *w, gpointer *data)
g_object_unref (gconf_client);
}
-void
+void
eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path)
{
GtkWidget *container;
diff --git a/e-util/e-non-intrusive-error-dialog.h b/e-util/e-non-intrusive-error-dialog.h
index 159242c0fa..f772a7b6f8 100644
--- a/e-util/e-non-intrusive-error-dialog.h
+++ b/e-util/e-non-intrusive-error-dialog.h
@@ -31,10 +31,10 @@
G_BEGIN_DECLS
struct _log_data {
- int level;
- char *key;
- char *text;
- char *stock_id;
+ gint level;
+ const gchar *key;
+ const gchar *text;
+ const gchar *stock_id;
GdkPixbuf *pbuf;
} ldata [] = {
{ E_LOG_ERROR, N_("Error"), N_("Errors"), GTK_STOCK_DIALOG_ERROR },
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 877d60ac41..b2338ccead 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
index d49d62cbb2..46eaf54199 100644
--- a/e-util/e-pilot-map.h
+++ b/e-util/e-pilot-map.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index 2273064ac3..582c9458e1 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
index 8559918eb3..0d7aebbd87 100644
--- a/e-util/e-pilot-util.h
+++ b/e-util/e-pilot-util.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 099efd0d65..2331af0f63 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
@@ -28,7 +28,7 @@
struct _EPluginUIHookPrivate {
- /* Table of GtkUIManager ID's to UI definitions.
+ /* Table of GtkUIManager ID's to UI definitions.
*
* For example:
*
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index 74d5bdc092..c9bddafb64 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index d43238be0a..7516fb3f09 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -459,7 +459,7 @@ ep_load(const char *filename, int load_level)
if (load_level == 1)
e_plugin_invoke (ep, "load_plugin_type_register_function", NULL);
}
- }
+ }
} else if (load_level == 2) {
ep = ep_load_plugin(root, pdoc);
}
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 0b31409c96..54855d0b95 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -376,8 +376,8 @@ struct _EPluginTypeHookClass {
GType e_plugin_type_hook_get_type(void);
-/* README: Currently there is only one flag.
- But we may need more in the future and hence makes
+/* README: Currently there is only one flag.
+ But we may need more in the future and hence makes
sense to keep as an enum */
typedef enum _EPluginFlags {
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 41428c3c5a..bcd152713c 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 877f5dfce4..65c51ce65f 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-print.c b/e-util/e-print.c
index 4cc3b8155e..8faeafc0f5 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-print.h b/e-util/e-print.h
index 93cbe2d10d..9469b63636 100644
--- a/e-util/e-print.h
+++ b/e-util/e-print.h
@@ -13,7 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 4fdd5d958a..ee98ad8b75 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index dd84671902..c20a5f1044 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-request.c b/e-util/e-request.c
index 1977b9b0fe..2175c75b2a 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-request.h b/e-util/e-request.h
index a84da2941a..ae822db83e 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index d2b575c15a..eaedddaf50 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index cfaa64c28a..8d8caed0a8 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index 0114ce6e06..1321fc59e1 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/e-util/e-signature-utils.h b/e-util/e-signature-utils.h
index 41472f45d0..56f8564131 100644
--- a/e-util/e-signature-utils.h
+++ b/e-util/e-signature-utils.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 2d0df59579..1cbed6b66b 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index cc5309c7c1..cc8591b421 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 582ed959ad..060c3f441a 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index f31d9b06cc..a02f5d9635 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 6176b58715..f63e5e1172 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 365d66a461..d64851bc70 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 60da48d375..f44019165d 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -29,8 +29,6 @@
#include "e-text-event-processor-emacs-like.h"
#include "e-util.h"
-static void e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *card);
-static void e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass);
static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
G_DEFINE_TYPE (ETextEventProcessorEmacsLike, e_text_event_processor_emacs_like, E_TEXT_EVENT_PROCESSOR_TYPE)
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 87e3fa797d..99635e2341 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index 9caf2abe6d..6e9d155f8c 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -83,8 +83,8 @@ typedef enum {
typedef struct {
ETextEventProcessorCommandPosition position;
ETextEventProcessorCommandAction action;
- int value;
- char *string;
+ gint value;
+ const gchar *string;
guint32 time;
} ETextEventProcessorCommand;
@@ -102,7 +102,7 @@ typedef struct {
guint state;
guint keyval;
gint length;
- gchar *string;
+ const gchar *string;
} ETextEventProcessorEventKey;
typedef struct {
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index b515f33f57..6496a63294 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -27,9 +27,6 @@
#include "e-text-event-processor.h"
#include "e-util.h"
-static void e_text_event_processor_init (ETextEventProcessor *card);
-static void e_text_event_processor_class_init (ETextEventProcessorClass *klass);
-
static void e_text_event_processor_set_property (GObject *object,
guint prop_id,
const GValue *value,
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 1f88407823..a9d329c140 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index 9d660b6600..2769001120 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -665,8 +665,8 @@ e_unicode_get_utf8 (const gchar *text, gunichar *out)
typedef struct
{
- unsigned short ch;
- char *expansion;
+ gushort ch;
+ const gchar *expansion;
} e_decomposition;
static e_decomposition e_decomp_table[] =
diff --git a/e-util/e-unicode.h b/e-util/e-unicode.h
index b745876b6d..77d1a351cb 100644
--- a/e-util/e-unicode.h
+++ b/e-util/e-unicode.h
@@ -12,7 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -102,7 +102,6 @@ gint e_unichar_to_utf8 (gint c,
gchar *outbuf);
gchar *e_unicode_get_utf8 (const gchar *text,
gunichar *out);
-guint32 gdk_keyval_to_unicode (guint keysym);
gchar *e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent,
const xmlChar *prop_name);
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index cca11e2477..f7d84dea37 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-util.c b/e-util/e-util.c
index e4658c1bd7..86589858af 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -1321,7 +1321,7 @@ e_file_lock_destroy ()
}
}
-gboolean
+gboolean
e_file_lock_exists ()
{
const char *fname = get_lock_filename ();
@@ -1358,7 +1358,7 @@ e_util_guess_mime_type (const char *filename, gboolean localfile)
fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
if (fi) {
mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
-
+
g_object_unref (fi);
}
@@ -1484,7 +1484,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer,
if (err)
res = FALSE;
-
+
if (res)
*buffer = buff;
else
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 458bef77a7..940cfc470f 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -148,16 +148,6 @@ GSList * e_util_get_category_filter_options
#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
GType e_camel_object_get_type (void);
-/* Camel uses its own object system, so we have to box
- * CamelObjects to safely use them as GObject properties. */
-#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
-GType e_camel_object_get_type (void);
-
-/* Camel uses its own object system, so we have to box
- * CamelObjects to safely use them as GObject properties. */
-#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
-GType e_camel_object_get_type (void);
-
G_END_DECLS
#endif /* _E_UTIL_H_ */
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 1c8c5d3f18..04c70afd75 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -11,7 +11,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 653669b381..73dd415a6d 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index 59d11c63fe..c327d61e17 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -10,7 +10,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Authors:
@@ -92,8 +92,6 @@ void e_xml_set_string_prop_by_name (xmlNode *parent,
gchar *e_xml_get_translated_string_prop_by_name (const xmlNode *parent,
const xmlChar *prop_name);
-int e_xml_save_file (const char *filename, xmlDocPtr doc);
-
G_END_DECLS
#endif /* __E_XML_UTILS__ */
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 852d5f8f53..5a3693730f 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2005 OpenedHand Ltd.
*
* Author: Jorn Baayen <jorn@openedhand.com>
@@ -29,7 +29,7 @@
struct _GConfBridge {
GConfClient *client;
-
+
GHashTable *bindings;
};
@@ -43,7 +43,7 @@ typedef enum {
typedef struct {
BindingType type;
guint id;
-
+
gboolean delayed_mode;
char *key;
@@ -107,11 +107,6 @@ typedef union {
static void
unbind (Binding *binding);
-#if !HAVE_DECL_GCONF_VALUE_COMPARE /* Not in headers in GConf < 2.13 */
-int gconf_value_compare (const GConfValue *value_a,
- const GConfValue *value_b);
-#endif
-
static GConfBridge *bridge = NULL; /* Global GConfBridge object */
/* Free up all resources allocated by the GConfBridge. Called on exit. */
@@ -154,7 +149,7 @@ gconf_bridge_get (void)
* gconf_bridge_get_client
* @bridge: A #GConfBridge
*
- * Returns the #GConfClient used by @bridge. This is the same #GConfClient
+ * Returns the #GConfClient used by @bridge. This is the same #GConfClient
* as returned by gconf_client_get_default().
*
* Return value: A #GConfClient.
@@ -188,7 +183,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
GConfValue *pref_value)
{
GValue src_value, value;
-
+
/* Make sure we don't enter an infinite synchronizing loop */
g_signal_handler_block (binding->object, binding->prop_notify_id);
@@ -234,7 +229,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
"transform a \"%s\" to a \"%s\".",
g_type_name (src_value.g_type),
g_type_name (value.g_type));
-
+
goto done;
}
@@ -244,7 +239,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
g_object_set_property (binding->object,
binding->prop->name, &src_value);
}
-
+
done:
g_value_unset (&src_value);
g_value_unset (&value);
@@ -402,7 +397,7 @@ prop_binding_pref_changed (GConfClient *client,
prop_binding_sync_pref_to_prop (binding, gconf_value);
}
-/* Performs a scheduled prop-to-pref sync for a prop binding in
+/* Performs a scheduled prop-to-pref sync for a prop binding in
* delay mode */
static gboolean
prop_binding_perform_scheduled_sync (PropBinding *binding)
@@ -412,7 +407,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding)
binding->sync_timeout_id = 0;
g_object_unref (binding->object);
-
+
return FALSE;
}
@@ -456,7 +451,7 @@ prop_binding_object_destroyed (gpointer user_data,
binding = (PropBinding *) user_data;
binding->object = NULL; /* Don't do anything with the object
at unbind() */
-
+
g_hash_table_remove (bridge->bindings,
GUINT_TO_POINTER (binding->id));
}
@@ -521,7 +516,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
binding->object = object;
binding->prop = pspec;
binding->sync_timeout_id = 0;
-
+
/* Watch GConf key */
binding->val_notify_id =
gconf_client_notify_add (bridge->client, key,
@@ -562,7 +557,7 @@ prop_binding_unbind (PropBinding *binding)
if (binding->delayed_mode && binding->sync_timeout_id > 0) {
/* Perform any scheduled syncs */
g_source_remove (binding->sync_timeout_id);
-
+
/* The object will still be around as we have
* a reference */
prop_binding_perform_scheduled_sync (binding);
@@ -701,7 +696,7 @@ window_binding_window_destroyed (gpointer user_data,
binding = (WindowBinding *) user_data;
binding->window = NULL; /* Don't do anything with the window
at unbind() */
-
+
g_hash_table_remove (bridge->bindings,
GUINT_TO_POINTER (binding->id));
}
@@ -713,7 +708,7 @@ window_binding_window_destroyed (gpointer user_data,
* @window: A #GtkWindow
* @bind_size: TRUE to bind the size of @window
* @bind_pos: TRUE to bind the position of @window
- *
+ *
* On calling this function @window will be resized to the values
* specified by "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height"
* and maximixed if "@key_prefix<!-- -->_maximized is TRUE if
@@ -789,7 +784,7 @@ gconf_bridge_bind_window (GConfBridge *bridge,
if (bind_pos) {
char *key;
GConfValue *x_val, *y_val;
-
+
key = g_strconcat (key_prefix, "_x", NULL);
x_val = gconf_client_get (bridge->client, key, NULL);
g_free (key);
@@ -884,7 +879,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding,
binding->row_inserted_id);
g_signal_handler_block (binding->list_store,
binding->row_deleted_id);
-
+
gtk_list_store_clear (binding->list_store);
list = gconf_value_get_list (value);
@@ -1001,7 +996,7 @@ list_store_binding_store_destroyed (gpointer user_data,
binding = (ListStoreBinding *) user_data;
binding->list_store = NULL; /* Don't do anything with the store
at unbind() */
-
+
g_hash_table_remove (bridge->bindings,
GUINT_TO_POINTER (binding->id));
}
@@ -1024,7 +1019,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding)
* @bridge: A #GConfBridge
* @key: A GConf key to be bound
* @list_store: A #GtkListStore
- *
+ *
* On calling this function single string column #GtkListStore @list_store
* will be kept synchronized with the GConf string list value pointed to by
* @key. On calling this function @list_store will be populated with the
@@ -1197,7 +1192,7 @@ gconf_bridge_unbind (GConfBridge *bridge,
/* This will trigger the hash tables value destruction
* function, which will take care of further cleanup */
- g_hash_table_remove (bridge->bindings,
+ g_hash_table_remove (bridge->bindings,
GUINT_TO_POINTER (binding_id));
}
diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h
index ba67f4f8e6..7edd2476dd 100644
--- a/e-util/gconf-bridge.h
+++ b/e-util/gconf-bridge.h
@@ -1,4 +1,4 @@
-/*
+/*
* (C) 2005 OpenedHand Ltd.
*
* Author: Jorn Baayen <jorn@openedhand.com>
@@ -81,7 +81,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge,
* @bridge: A #GConfBridge
* @key_prefix: The prefix of the GConf keys
* @window: A #GtkWindow
- *
+ *
* On calling this function @window will be resized to the values specified by
* "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height". The respective
* GConf values will be updated when the window is resized. See
@@ -95,7 +95,7 @@ guint gconf_bridge_bind_window (GConfBridge *bridge,
* @bridge: A #GConfBridge
* @key_prefix: The prefix of the GConf keys
* @window: A #GtkWindow
- *
+ *
* On calling this function @window will be moved to the values specified by
* "@key_prefix<!-- -->_x" and "@key_prefix<!-- -->_y". The respective GConf
* values will be updated when the window is moved. See