aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/e-component-registry.c2
-rw-r--r--shell/e-shell-importer.c2
-rw-r--r--shell/e-shell-settings-dialog.c6
-rw-r--r--shell/e-shell-window-commands.c2
-rw-r--r--shell/e-shell-window.c8
-rw-r--r--shell/e-shell.c4
-rw-r--r--shell/e-sidebar.c14
-rw-r--r--shell/e-user-creatable-items-handler.c2
-rw-r--r--shell/importer/evolution-importer.c2
9 files changed, 21 insertions, 21 deletions
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 877c410289..97490b45ac 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -49,7 +49,7 @@ component_info_new (const gchar *id,
GNOME_Evolution_Component iface,
const gchar *alias,
const gchar *button_label,
- const gchar *button_tooltips,
+ const gchar *button_tooltips,
const gchar *menu_label,
const gchar *menu_accelerator,
const gchar *icon_name,
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 0e0a07ea21..30318ccb0b 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -440,7 +440,7 @@ static void
import_druid_cancel (GnomeDruid *druid,
ImportData *data)
{
- gtk_widget_destroy (GTK_WIDGET (data->dialog));
+ gtk_widget_destroy (GTK_WIDGET (data->dialog));
}
static gboolean
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 1a9529688e..8b13233a9d 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -190,9 +190,9 @@ load_pages (EShellSettingsDialog *dialog)
info = & control_list->_buffer[i];
- title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages);
- description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages);
- icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL);
+ title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages);
+ description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages);
+ icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL);
type = bonobo_server_info_prop_find (info, "evolution2:config_item:type");
priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL);
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index a81bacf07a..3f9c4b0f26 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -958,7 +958,7 @@ command_about (BonoboUIComponent *uih,
static void
command_open_faq (BonoboUIComponent *uih,
EShellWindow *window,
- const gchar *path)
+ const gchar *path)
{
const gchar *uri;
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 8b24805fd4..eb1f96e6d8 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -628,7 +628,7 @@ static GConfEnumStringPair button_styles[] = {
{ E_SIDEBAR_MODE_ICON, "icons" },
{ E_SIDEBAR_MODE_BOTH, "both" },
{ E_SIDEBAR_MODE_TOOLBAR, "toolbar" },
- { -1, NULL }
+ { -1, NULL }
};
static void
@@ -687,7 +687,7 @@ setup_widgets (EShellWindow *window)
"/apps/evolution/shell/view_defaults/buttons_style",
NULL);
- if (gconf_string_to_enum (button_styles, style, &mode)) {
+ if (gconf_string_to_enum (button_styles, style, &mode)) {
switch (mode) {
case E_SIDEBAR_MODE_TEXT:
bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
@@ -718,7 +718,7 @@ setup_widgets (EShellWindow *window)
/* Status Bar*/
visible = gconf_client_get_bool (gconf_client,
- "/apps/evolution/shell/view_defaults/statusbar_visible",
+ "/apps/evolution/shell/view_defaults/statusbar_visible",
NULL);
bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
"/commands/ViewStatusBar",
@@ -728,7 +728,7 @@ setup_widgets (EShellWindow *window)
/* Side Bar*/
visible = gconf_client_get_bool (gconf_client,
- "/apps/evolution/shell/view_defaults/sidebar_visible",
+ "/apps/evolution/shell/view_defaults/sidebar_visible",
NULL);
bonobo_ui_component_set_prop (e_shell_window_peek_bonobo_ui_component (window),
"/commands/ViewSideBar",
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ed7f8cc4b0..de4e0a88ca 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -269,7 +269,7 @@ impl_Shell_handleURI (PortableServer_Servant servant,
if (p)
*p = 0;
- component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
+ component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
if (component_info == NULL) {
show = TRUE;
component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema);
@@ -855,7 +855,7 @@ e_shell_attempt_upgrade (EShell *shell)
check_old:
/* if the last upgraded version was old, check for stuff to remove */
if (done_upgrade
- || (last_version = gconf_client_get_string (gconf_client, "/apps/evolution/last_version", NULL)) == NULL
+ || (last_version = gconf_client_get_string (gconf_client, "/apps/evolution/last_version", NULL)) == NULL
|| sscanf(last_version, "%d.%d.%d", &lmajor, &lminor, &lrevision) != 3) {
lmajor = major;
lminor = minor;
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 3326c5d1dc..6a061ab422 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -437,7 +437,7 @@ impl_dispose (GObject *object)
priv->style_changed_id = 0;
}
- g_object_unref (gconf_client);
+ g_object_unref (gconf_client);
(* G_OBJECT_CLASS (e_sidebar_parent_class)->dispose) (object);
}
@@ -558,8 +558,8 @@ e_sidebar_add_button (ESidebar *sidebar,
if (sidebar->priv->show)
gtk_widget_show (button_widget);
g_signal_connect (button_widget, "toggled", G_CALLBACK (button_toggled_callback), sidebar);
- g_signal_connect (button_widget, "button_press_event",
- G_CALLBACK (button_pressed_callback), sidebar);
+ g_signal_connect (button_widget, "button_press_event",
+ G_CALLBACK (button_pressed_callback), sidebar);
hbox = gtk_hbox_new (FALSE, 3);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
@@ -659,7 +659,7 @@ static GConfEnumStringPair toolbar_styles[] = {
{ E_SIDEBAR_MODE_BOTH, "both" },
{ E_SIDEBAR_MODE_BOTH, "both-horiz" },
{ E_SIDEBAR_MODE_BOTH, "both_horiz" },
- { -1, NULL }
+ { -1, NULL }
};
static void
@@ -715,15 +715,15 @@ static void
style_changed_notify (GConfClient *gconf, guint id, GConfEntry *entry, gpointer data)
{
ESidebar *sidebar = data;
- gchar *val;
- gint mode;
+ gchar *val;
+ gint mode;
val = gconf_client_get_string (gconf, "/desktop/gnome/interface/toolbar_style", NULL);
if (val == NULL || !gconf_string_to_enum (toolbar_styles, val, &mode))
mode = E_SIDEBAR_MODE_BOTH;
g_free(val);
- set_mode_internal (E_SIDEBAR (sidebar), mode);
+ set_mode_internal (E_SIDEBAR (sidebar), mode);
sidebar->priv->toolbar_mode = mode;
gtk_widget_queue_resize (GTK_WIDGET (sidebar));
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index f5af1575dd..2fe35ddb78 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -717,7 +717,7 @@ static void
setup_toolbar_button (EUserCreatableItemsHandler *handler)
{
EUserCreatableItemsHandlerPrivate *priv;
- GConfClient *gconf = gconf_client_get_default ();
+ GConfClient *gconf = gconf_client_get_default ();
gchar *val;
priv = handler->priv;
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 26b06e7c20..17e118094b 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -229,7 +229,7 @@ evolution_importer_construct (EvolutionImporter *importer,
*/
EvolutionImporter *
evolution_importer_new (EvolutionImporterCreateControlFn create_control_fn,
- EvolutionImporterSupportFormatFn support_format_fn,
+ EvolutionImporterSupportFormatFn support_format_fn,
EvolutionImporterLoadFileFn load_file_fn,
EvolutionImporterProcessItemFn process_item_fn,
EvolutionImporterGetErrorFn get_error_fn,