diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2007-11-15 06:04:21 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-11-15 06:04:21 +0800 |
commit | 9e4fcb29cf7f05c18f7fd34e318f9e795fa32e91 (patch) | |
tree | 2e1e96f33404781354c422a7e9beaf458ebeb655 /shell/importer | |
parent | 7e8f8bb9e5167b0219b48ab3e8062080d3740b0a (diff) | |
download | gsoc2013-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/importer')
-rw-r--r-- | shell/importer/evolution-importer-client.c | 20 | ||||
-rw-r--r-- | shell/importer/evolution-importer-listener.c | 8 | ||||
-rw-r--r-- | shell/importer/evolution-importer-listener.h | 2 | ||||
-rw-r--r-- | shell/importer/evolution-importer.c | 4 | ||||
-rw-r--r-- | shell/importer/evolution-importer.h | 4 | ||||
-rw-r--r-- | shell/importer/evolution-intelligent-importer.c | 16 | ||||
-rw-r--r-- | shell/importer/intelligent.c | 54 |
7 files changed, 54 insertions, 54 deletions
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c index 24ed38b445..89cac677d3 100644 --- a/shell/importer/evolution-importer-client.c +++ b/shell/importer/evolution-importer-client.c @@ -66,7 +66,7 @@ evolution_importer_client_init (EvolutionImporterClient *client) * @objref: The CORBA_Object to make a client for. * * Makes a client for @objref. @objref should be an Evolution_Importer. - * + * * Returns: A newly created EvolutionImporterClient. */ EvolutionImporterClient * @@ -87,7 +87,7 @@ evolution_importer_client_new (const CORBA_Object objref) * @id: The oafiid of the component to make a client for. * * Makes a client for the object returned by activating @id. - * + * * Returns: A newly created EvolutionImporterClient. */ EvolutionImporterClient * @@ -123,7 +123,7 @@ evolution_importer_client_create_control (EvolutionImporterClient *client) GtkWidget *widget = NULL; Bonobo_Control control; CORBA_Environment ev; - + g_return_val_if_fail (client != NULL, NULL); g_return_val_if_fail (EVOLUTION_IS_IMPORTER_CLIENT (client), NULL); @@ -135,11 +135,11 @@ evolution_importer_client_create_control (EvolutionImporterClient *client) /* FIXME Pass in container? */ widget = bonobo_widget_new_control_from_objref (control, NULL); gtk_widget_show (widget); - } - + } + CORBA_exception_free (&ev); - return widget; + return widget; } /** @@ -165,7 +165,7 @@ evolution_importer_client_support_format (EvolutionImporterClient *client, CORBA_exception_init (&ev); corba_importer = client->objref; - result = GNOME_Evolution_Importer_supportFormat (corba_importer, + result = GNOME_Evolution_Importer_supportFormat (corba_importer, filename, &ev); CORBA_exception_free (&ev); @@ -242,9 +242,9 @@ evolution_importer_client_process_item (EvolutionImporterClient *client, * evolution_importer_client_get_error: * @client: The EvolutionImporterClient. * - * Gets the error as a string. + * Gets the error as a string. * - * Returns: The error as a string. If there is no error NULL is returned. + * Returns: The error as a string. If there is no error NULL is returned. * Importers need not support this method and if so, NULL is also returned. */ const char * @@ -261,6 +261,6 @@ evolution_importer_client_get_error (EvolutionImporterClient *client) CORBA_exception_init (&ev); str = GNOME_Evolution_Importer_getError (corba_importer, &ev); - + return str; } diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index 182c726ee4..85c9211377 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -110,12 +110,12 @@ impl_GNOME_Evolution_ImporterListener_notifyResult (PortableServer_Servant serva out_result = corba_result_to_evolution (result); if (priv->callback) { - (priv->callback) (listener, out_result, more_items, + (priv->callback) (listener, out_result, more_items, priv->closure); } return; -} +} /* GObject methods */ @@ -152,7 +152,7 @@ corba_class_init (void) epv = g_new0 (POA_GNOME_Evolution_ImporterListener__epv, 1); epv->notifyResult = impl_GNOME_Evolution_ImporterListener_notifyResult; - + vepv = &Listener_vepv; vepv->_base_epv = base_epv; vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); @@ -165,7 +165,7 @@ evolution_importer_listener_class_init (EvolutionImporterListenerClass *klass) { GObjectClass *object_class; POA_GNOME_Evolution_ImporterListener__epv *epv = &klass->epv; - + object_class = G_OBJECT_CLASS (klass); object_class->finalize = finalise; diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h index 14951a9fac..fdd673089e 100644 --- a/shell/importer/evolution-importer-listener.h +++ b/shell/importer/evolution-importer-listener.h @@ -49,7 +49,7 @@ typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *l void *closure); struct _EvolutionImporterListener { BonoboObject parent; - + EvolutionImporterListenerPrivate *priv; }; diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c index 88322a7ba2..a437fd6209 100644 --- a/shell/importer/evolution-importer.c +++ b/shell/importer/evolution-importer.c @@ -80,7 +80,7 @@ impl_GNOME_Evolution_Importer_supportFormat (PortableServer_Servant servant, priv = importer->priv; if (priv->support_format_fn != NULL) - return (priv->support_format_fn) (importer, filename, + return (priv->support_format_fn) (importer, filename, priv->closure); else return FALSE; @@ -222,7 +222,7 @@ evolution_importer_construct (EvolutionImporter *importer, * @get_error_fn: The function to be called by the getError method. * @closure: The data to be passed to all of the above functions. * - * Creates a new EvolutionImporter object. Of the parameters only + * Creates a new EvolutionImporter object. Of the parameters only * @get_error_function and @closure may be #NULL. * * Returns: A newly created EvolutionImporter object. diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index 0314ec71cb..21d661d0ff 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -73,13 +73,13 @@ typedef enum { struct _EvolutionImporter { BonoboObject parent; - + EvolutionImporterPrivate *priv; }; struct _EvolutionImporterClass { BonoboObjectClass parent_class; - + POA_GNOME_Evolution_Importer__epv epv; }; diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index 8070f7be18..ff786efd3d 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -54,10 +54,10 @@ impl_GNOME_Evolution_IntelligentImporter__get_importername (PortableServer_Serva CORBA_Environment *ev) { EvolutionIntelligentImporter *ii; - + ii = evolution_intelligent_importer_from_servant (servant); - return CORBA_string_dup (ii->priv->importername ? + return CORBA_string_dup (ii->priv->importername ? ii->priv->importername : ""); } @@ -82,8 +82,8 @@ impl_GNOME_Evolution_IntelligentImporter_canImport (PortableServer_Servant serva ii = evolution_intelligent_importer_from_servant (servant); priv = ii->priv; - - if (priv->can_import_fn != NULL) + + if (priv->can_import_fn != NULL) return (priv->can_import_fn) (ii, priv->closure); else return FALSE; @@ -108,9 +108,9 @@ static void finalise (GObject *object) { EvolutionIntelligentImporter *ii; - + ii = EVOLUTION_INTELLIGENT_IMPORTER (object); - + if (ii->priv == NULL) return; @@ -129,7 +129,7 @@ evolution_intelligent_importer_class_init (EvolutionIntelligentImporterClass *kl object_class = G_OBJECT_CLASS (klass); object_class->finalize = finalise; - + parent_class = g_type_class_ref(PARENT_TYPE); epv->_get_importername = impl_GNOME_Evolution_IntelligentImporter__get_importername; epv->_get_message = impl_GNOME_Evolution_IntelligentImporter__get_message; @@ -165,7 +165,7 @@ evolution_intelligent_importer_construct (EvolutionIntelligentImporter *ii, * evolution_intelligent_importer_new: * can_import_fn: The function that will be called to see if this importer can do * anything. - * import_data_fn: The function that will be called when the importer should + * import_data_fn: The function that will be called when the importer should * import the data. * importername: The name of this importer. * message: The message that will be displayed when the importer can import. diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index db6906b836..47c1a9537e 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -1,20 +1,20 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* intelligent.c - * - * Authors: + * + * Authors: * Iain Holmes <iain@ximian.com> * * Copyright 2001 Ximian, Inc. (www.ximian.com) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 @@ -101,7 +101,7 @@ free_importer_dialog (IntelligentImporterDialog *d) data = l->data; CORBA_exception_init (&ev); - if (data->object != CORBA_OBJECT_NIL) + if (data->object != CORBA_OBJECT_NIL) bonobo_object_release_unref (data->object, &ev); g_free (data->iid); @@ -147,7 +147,7 @@ get_intelligent_importers (void) for (i = 0; i < info_list->_length; i++) { const Bonobo_ServerInfo *info; - + info = info_list->_buffer + i; iids_ret = g_list_prepend (iids_ret, g_strdup (info->iid)); } @@ -207,7 +207,7 @@ create_gui (GList *importers) d->clist = clist = gtk_clist_new (1); gtk_clist_set_selection_mode (GTK_CLIST (d->clist), GTK_SELECTION_MULTIPLE); - + label = gtk_label_new (_("Evolution can import data from the following files:")); gtk_misc_set_alignment(GTK_MISC(label), 0, .5); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, @@ -220,14 +220,14 @@ create_gui (GList *importers) TRUE, TRUE, 0); sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), - GTK_POLICY_AUTOMATIC, + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); gtk_widget_set_size_request (sw, 300, 150); gtk_container_add (GTK_CONTAINER (sw), clist); gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0); - + vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); @@ -246,10 +246,10 @@ create_gui (GList *importers) prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir ()); gnome_config_push_prefix (prefix); g_free (prefix); - + dontaskagain = gnome_config_get_bool (l->data); gnome_config_pop_prefix (); - + if (dontaskagain) continue; @@ -257,7 +257,7 @@ create_gui (GList *importers) data->iid = g_strdup (l->data); CORBA_exception_init (&ev); - data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0, + data->object = bonobo_activation_activate_from_id ((char *) data->iid, 0, NULL, &ev); if (ev._major != CORBA_NO_EXCEPTION) { g_warning ("Could not start %s: %s", data->iid, @@ -282,7 +282,7 @@ create_gui (GList *importers) can_run = GNOME_Evolution_IntelligentImporter_canImport (data->object, &ev); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("Could not get canImport(%s): %s", + g_warning ("Could not get canImport(%s): %s", data->iid, CORBA_exception_id (&ev)); bonobo_object_release_unref (data->object, &ev); CORBA_exception_free (&ev); @@ -291,7 +291,7 @@ create_gui (GList *importers) continue; } CORBA_exception_free (&ev); - + if (can_run == FALSE) { CORBA_exception_init (&ev); bonobo_object_release_unref (data->object, &ev); @@ -305,7 +305,7 @@ create_gui (GList *importers) data->name = g_strdup (GNOME_Evolution_IntelligentImporter__get_importername (data->object, &ev)); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("Could not get name(%s): %s", + g_warning ("Could not get name(%s): %s", data->iid, CORBA_exception_id (&ev)); bonobo_object_release_unref (data->object, &ev); CORBA_exception_free (&ev); @@ -316,7 +316,7 @@ create_gui (GList *importers) data->blurb = g_strdup (GNOME_Evolution_IntelligentImporter__get_message (data->object, &ev)); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("Could not get message(%s): %s", + g_warning ("Could not get message(%s): %s", data->iid, CORBA_exception_id (&ev)); bonobo_object_release_unref (data->object, &ev); CORBA_exception_free (&ev); @@ -356,7 +356,7 @@ create_gui (GList *importers) text[0] = data->name; gtk_clist_prepend (GTK_CLIST (clist), text); } - + d->running = running; dummy = gtk_drawing_area_new (); gtk_widget_show (dummy); @@ -365,7 +365,7 @@ create_gui (GList *importers) /* Set the start to the blank page */ gtk_notebook_set_current_page (GTK_NOTEBOOK (d->placeholder), running); - g_signal_connect((clist), "select-row", + g_signal_connect((clist), "select-row", G_CALLBACK (select_row_cb), d); g_signal_connect((clist), "unselect-row", G_CALLBACK (unselect_row_cb), d); @@ -386,10 +386,10 @@ intelligent_importer_init (void) prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir()); gnome_config_push_prefix (prefix); g_free (prefix); - + dontaskagain = gnome_config_get_bool ("Dontaskagain=False"); gnome_config_pop_prefix (); - + if (dontaskagain) { return; } @@ -423,7 +423,7 @@ intelligent_importer_init (void) new_data = g_new (SelectedImporterData, 1); new_data->iid = iid; - /* Reference the remote object, and duplicate the + /* Reference the remote object, and duplicate the local one. */ CORBA_exception_init (&ev); new_data->importer = bonobo_object_dup_ref (data->object, &ev); @@ -440,14 +440,14 @@ intelligent_importer_init (void) selected = g_list_prepend (selected, new_data); } - /* Now destroy all the importers, as we've kept references to + /* Now destroy all the importers, as we've kept references to the ones we need */ free_importer_dialog (d); if (selected != NULL) { /* Restart the selected ones */ start_importers (selected); - + /* Free the selected list */ for (l = selected; l; l = l->next) { CORBA_Environment ev; @@ -464,12 +464,12 @@ intelligent_importer_init (void) } break; - + case GTK_RESPONSE_CANCEL: /* Dont ask again */ prefix = g_strdup_printf ("=%s/evolution/config/Shell=/intelligent-importers/", g_get_home_dir()); gnome_config_push_prefix (prefix); g_free (prefix); - + gnome_config_set_bool ("Dontaskagain", TRUE); gnome_config_pop_prefix (); |