aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-config-upgrade.c
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2007-10-26 16:40:03 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2007-10-26 16:40:03 +0800
commit5b97425db517f77351ff72380c21e0ff3be77cd3 (patch)
tree260004c4a714adae56b0be4eb56d65ef49a0fb61 /shell/e-config-upgrade.c
parentac2923d34b8eae31908ee1c4611fab81ff5419ba (diff)
downloadgsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar.gz
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar.bz2
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar.lz
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar.xz
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.tar.zst
gsoc2013-evolution-5b97425db517f77351ff72380c21e0ff3be77cd3.zip
Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of declarations - guint
2007-10-26 Kjartan Maraas <kmaraas@gnome.org> * e-component-registry.c: (query_components): * e-component-view.c: (e_component_view_new), (e_component_view_new_controls), (e_component_view_set_title), (e_component_view_set_button_icon): * e-config-upgrade.c: * e-shell-settings-dialog.c: (e_shell_settings_dialog_new): * e-shell-window.c: (component_view_free): * es-event.c: (es_event_peek): * es-menu.c: (es_menu_new): * importer/evolution-importer-client.c: (evolution_importer_client_create_control): Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of declarations - guint for 1-bit bitfields svn path=/trunk/; revision=34430
Diffstat (limited to 'shell/e-config-upgrade.c')
-rw-r--r--shell/e-config-upgrade.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index a95fff37b3..75c6e6228a 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -50,14 +50,14 @@ static e_gconf_map_t importer_elm_map[] = {
/* /Importer/Elm */
{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
{ "mail-imported", "importer/elm/mail-imported", E_GCONF_MAP_BOOL },
- { 0 },
+ { NULL },
};
static e_gconf_map_t importer_pine_map[] = {
/* /Importer/Pine */
{ "mail", "importer/elm/mail", E_GCONF_MAP_BOOL },
{ "address", "importer/elm/address", E_GCONF_MAP_BOOL },
- { 0 },
+ { NULL },
};
static e_gconf_map_t importer_netscape_map[] = {
@@ -65,7 +65,7 @@ static e_gconf_map_t importer_netscape_map[] = {
{ "mail", "importer/netscape/mail", E_GCONF_MAP_BOOL },
{ "settings", "importer/netscape/settings", E_GCONF_MAP_BOOL },
{ "filters", "importer/netscape/filters", E_GCONF_MAP_BOOL },
- { 0 },
+ { NULL },
};
/* ********************************************************************** */
@@ -76,19 +76,19 @@ static e_gconf_map_t shell_views_map[] = {
{ "Width", "shell/view_defaults/width", E_GCONF_MAP_INT },
{ "Height", "shell/view_defaults/height", E_GCONF_MAP_INT },
{ "ViewPanedPosition", "shell/view_defaults/folder_bar/width", E_GCONF_MAP_INT },
- { 0 },
+ { NULL },
};
static e_gconf_map_t offlinefolders_map[] = {
/* /OfflineFolders */
{ "paths", "shell/offline/folder_paths", E_GCONF_MAP_ANYLIST },
- { 0 },
+ { NULL },
};
static e_gconf_map_t shell_map[] = {
/* /Shell */
{ "StartOffline", "shell/start_offline", E_GCONF_MAP_BOOL },
- { 0 },
+ { NULL },
};
/* ********************************************************************** */
@@ -96,13 +96,13 @@ static e_gconf_map_t shell_map[] = {
static e_gconf_map_t addressbook_map[] = {
/* /Addressbook */
{ "select_names_uri", "addressbook/select_names/last_used_uri", E_GCONF_MAP_STRING },
- { 0 },
+ { NULL },
};
static e_gconf_map_t addressbook_completion_map[] = {
/* /Addressbook/Completion */
{ "uris", "addressbook/completion/uris", E_GCONF_MAP_STRING },
- { 0 },
+ { NULL },
};
/* ********************************************************************** */
@@ -114,7 +114,7 @@ static e_gconf_map_t general_map[] = {
/* ********************************************************************** */
-e_gconf_map_list_t remap_list[] = {
+static e_gconf_map_list_t remap_list[] = {
{ "/Importer/Elm", importer_elm_map },
{ "/Importer/Pine", importer_pine_map },
{ "/Importer/Netscape", importer_netscape_map },
@@ -128,7 +128,7 @@ e_gconf_map_list_t remap_list[] = {
{ "/General", general_map },
- { 0 },
+ { NULL },
};
int