aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-11-15 06:04:21 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-11-15 06:04:21 +0800
commit9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91 (patch)
tree2e1e96f33404781354c422a7e9beaf458ebeb655 /shell/e-shell.c
parent7e8f8bb9e5167b0219b48ab3e8062080d3740b0a (diff)
downloadgsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.gz
gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.tar.zst
gsoc2013-evolution-9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91.zip
** Remove trailing whitespace from source code.
2007-11-14 Matthew Barnes <mbarnes@redhat.com> ** Remove trailing whitespace from source code. svn path=/trunk/; revision=34537
Diffstat (limited to 'shell/e-shell.c')
-rw-r--r--shell/e-shell.c110
1 files changed, 55 insertions, 55 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0fdf766903..4e651453a4 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -165,11 +165,11 @@ set_interactive (EShell *shell,
GtkWidget *view;
g_return_if_fail (E_IS_SHELL (shell));
-
+
shell->priv->is_interactive = interactive;
num_windows = g_list_length (shell->priv->windows);
-
+
/* We want to send the "interactive" message only when the first
window is created */
if (num_windows != 1)
@@ -196,7 +196,7 @@ set_interactive (EShell *shell,
/* Ignore errors, the components can decide to not implement
this interface. */
-
+
CORBA_exception_free (&ev);
}
}
@@ -249,7 +249,7 @@ impl_Shell_createNewWindow (PortableServer_Servant servant,
/* refs?? */
shell_view = e_shell_view_new(shell_window);
-
+
return BONOBO_OBJREF(shell_view);
}
@@ -283,14 +283,14 @@ impl_Shell_handleURI (PortableServer_Servant servant,
if (show) {
GtkWidget *shell_window;
-
+
shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
if (shell_window == NULL) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
return;
}
}
-
+
GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
/* not an error not to implement it */
if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)
@@ -556,10 +556,10 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
{
char *val, *evolution_dir;
struct stat st;
-
+
evolution_dir = g_build_filename (g_get_home_dir (), "evolution", NULL);
-
- val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);
+
+ val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);
if (val) {
/* Since 1.4.0 We've been keeping the version key in gconf */
sscanf(val, "%d.%d.%d", major, minor, revision);
@@ -593,7 +593,7 @@ detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
}
g_free (tmp);
if (config_doc)
- xmlFreeDoc (config_doc);
+ xmlFreeDoc (config_doc);
}
g_free (evolution_dir);
@@ -615,9 +615,9 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision)
CORBA_Environment ev;
CORBA_exception_init (&ev);
-
+
GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev);
-
+
if (BONOBO_EX (&ev)) {
char *exception_text;
CORBA_char *id = CORBA_exception_id(&ev);
@@ -654,7 +654,7 @@ attempt_upgrade (EShell *shell, int major, int minor, int revision)
* @shell: An EShell object to construct
* @iid: OAFIID for registering the shell into the name server
* @startup_line_mode: How to set up the line mode (online or offline) initally.
- *
+ *
* Construct @shell so that it uses the specified @corba_object.
*
* Return value: The result of the operation.
@@ -668,31 +668,31 @@ e_shell_construct (EShell *shell,
CORBA_Object corba_object;
gboolean start_online;
GSList *component;
-
+
g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
g_return_val_if_fail (startup_line_mode == E_SHELL_STARTUP_LINE_MODE_CONFIG
|| startup_line_mode == E_SHELL_STARTUP_LINE_MODE_ONLINE
|| startup_line_mode == E_SHELL_STARTUP_LINE_MODE_OFFLINE,
E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
-
+
priv = shell->priv;
priv->iid = g_strdup (iid);
/* Now we can register into OAF. Notice that we shouldn't be
registering into OAF until we are sure we can complete. */
-
+
/* FIXME: Multi-display stuff. */
corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS)
return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER;
while (gtk_events_pending ())
- gtk_main_iteration ();
-
+ gtk_main_iteration ();
+
/* activate all the components (peek list does this implictly) */
/* Do we really need to assign the result of this to the list? */
component = e_component_registry_peek_list (shell->priv->component_registry);
-
+
e_shell_attempt_upgrade(shell);
priv->is_initialized = TRUE;
@@ -725,10 +725,10 @@ e_shell_construct (EShell *shell,
* @start_online: Whether to start in on-line mode or not.
* @construct_result_return: A pointer to an EShellConstructResult variable into
* which the result of the operation will be stored.
- *
+ *
* Create a new EShell.
- *
- * Return value:
+ *
+ * Return value:
**/
EShell *
e_shell_new (EShellStartupLineMode startup_line_mode,
@@ -793,10 +793,10 @@ fail:
/**
* e_shell_attempt_upgrade:
- * @shell:
- *
+ * @shell:
+ *
* Upgrade config and components from the currently installed version.
- *
+ *
* Return value: %TRUE If it works. If it fails the application will exit.
**/
gboolean
@@ -904,13 +904,13 @@ check_old:
/** @Event: Shell attempted upgrade
* @Id: upgrade.done
* @Target: ESMenuTargetState
- *
+ *
* This event is emitted whenever the shell successfully attempts an upgrade.
*
*/
ese = es_event_peek();
e_event_emit((EEvent *)ese, "upgrade.done", (EEventTarget *)es_event_target_new_upgrade(ese, cmajor, cminor, crevision));
-
+
return TRUE;
}
@@ -919,9 +919,9 @@ check_old:
* @shell: The shell for which to create a new window.
* @component_id: Id or alias of the component to display in the new window.
* @template_window: Window from which to copy the window settings (can be %NULL).
- *
+ *
* Create a new window for @uri.
- *
+ *
* Return value: The new window.
**/
EShellWindow *
@@ -952,7 +952,7 @@ e_shell_create_window (EShell *shell,
if (!session_started) {
ESEvent *ese;
-
+
session_started = TRUE;
ese = es_event_peek();
e_event_emit((EEvent *)ese, "started.done", (EEventTarget *)es_event_target_new_shell(ese, shell));
@@ -981,9 +981,9 @@ e_shell_request_close_window (EShell *shell,
/**
* e_shell_peek_uri_schema_registry:
* @shell: An EShell object.
- *
+ *
* Get the schema registry associated to @shell.
- *
+ *
* Return value: A pointer to the EUriSchemaRegistry associated to @shell.
**/
EUriSchemaRegistry *
@@ -998,11 +998,11 @@ e_shell_peek_uri_schema_registry (EShell *shell)
/**
* e_shell_peek_component_registry:
- * @shell:
- *
+ * @shell:
+ *
* Get the component registry associated to @shell.
- *
- * Return value:
+ *
+ * Return value:
**/
EComponentRegistry *
e_shell_peek_component_registry (EShell *shell)
@@ -1015,10 +1015,10 @@ e_shell_peek_component_registry (EShell *shell)
/**
* e_shell_save_settings:
- * @shell:
- *
+ * @shell:
+ *
* Save the settings for this shell.
- *
+ *
* Return value: %TRUE if it worked, %FALSE otherwise. Even if %FALSE is
* returned, it is possible that at least part of the settings for the windows
* have been saved.
@@ -1040,8 +1040,8 @@ e_shell_save_settings (EShell *shell)
/**
* e_shell_close_all_windows:
- * @shell:
- *
+ * @shell:
+ *
* Destroy all the windows in @shell.
**/
void
@@ -1054,7 +1054,7 @@ e_shell_close_all_windows (EShell *shell)
g_return_if_fail (E_IS_SHELL (shell));
if (shell->priv->windows)
- e_shell_save_settings (shell);
+ e_shell_save_settings (shell);
priv = shell->priv;
for (p = priv->windows; p != NULL; p = pnext) {
@@ -1069,9 +1069,9 @@ e_shell_close_all_windows (EShell *shell)
/**
* e_shell_get_line_status:
* @shell: A pointer to an EShell object.
- *
+ *
* Get the line status for @shell.
- *
+ *
* Return value: The current line status for @shell.
**/
EShellLineStatus
@@ -1100,7 +1100,7 @@ set_line_status_finished(EShell *shell)
/** @Event: Shell online state changed
* @Id: state.changed
* @Target: ESMenuTargetState
- *
+ *
* This event is emitted whenever the shell online state changes.
*
* Only the online and offline states are emitted.
@@ -1133,10 +1133,10 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
gboolean status;
priv = shell->priv;
-
+
if (shell_state == GNOME_Evolution_FORCED_OFFLINE || shell_state == GNOME_Evolution_USER_OFFLINE)
status = FALSE;
- else
+ else
status = TRUE;
if ((status && priv->line_status == E_SHELL_LINE_STATUS_ONLINE)
@@ -1165,7 +1165,7 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
GNOME_Evolution_Component_setLineStatus(info->iface, shell_state, bonobo_object_corba_objref((BonoboObject *)priv->line_status_listener), &ev);
if (ev._major == CORBA_NO_EXCEPTION)
priv->line_status_pending++;
-
+
CORBA_exception_free (&ev);
}
@@ -1176,9 +1176,9 @@ set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
/**
* e_shell_go_offline:
- * @shell:
+ * @shell:
* @action_window: Obsolete/unused.
- *
+ *
* Make the shell go into off-line mode.
**/
void
@@ -1195,9 +1195,9 @@ e_shell_go_offline (EShell *shell,
/**
* e_shell_go_online:
- * @shell:
+ * @shell:
* @action_window: Obsolete/unused.
- *
+ *
* Make the shell go into on-line mode.
**/
void
@@ -1243,18 +1243,18 @@ e_shell_show_settings (EShell *shell,
EShellWindow *shell_window)
{
EShellPrivate *priv;
-
+
g_return_if_fail (shell != NULL);
g_return_if_fail (E_IS_SHELL (shell));
priv = shell->priv;
-
+
if (priv->settings_dialog.widget != NULL) {
gdk_window_show (priv->settings_dialog.widget->window);
gtk_widget_grab_focus (priv->settings_dialog.widget);
return;
}
-
+
priv->settings_dialog.widget = e_shell_settings_dialog_new ();
if (type != NULL)