aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-08-28 08:18:34 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-08-28 08:18:34 +0800
commitd671e29102193b74bf977ac068a2adea2fc12a6c (patch)
treee55b66c56afefe228528b180ed8a4e0212bb51a6 /addressbook/gui
parentc612c3240c1e3ebe2ec29c0977f02f1d628ab1de (diff)
downloadgsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar.gz
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar.bz2
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar.lz
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar.xz
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.tar.zst
gsoc2013-evolution-d671e29102193b74bf977ac068a2adea2fc12a6c.zip
Studlycapsize all the IDs that are not. Likewise. Updated accordingly.
* Evolution-ShellComponent.idl: Studlycapsize all the IDs that are not. * Evolution-common.idl: Likewise. * evolution-activity-client.c: Updated accordingly. * evolution-shell-component.c: Likewise. * evolution-storage.c: Likewise. * e-activity-handler.c: Likewise. * e-component-registry.c: Likewise. * e-corba-storage.c: Likewise. * e-shell-user-creatable-items-handlers.c: Likewise. * e-local-storage.c (remove_folder): Remove unused variable. * e-shell-view.c (update_for_current_uri): Assign zero to `unread_count', not NULL. * e-shell-importer.c (import_druid_finish): Remove unused variable. * e-shell-user-creatable-items-handler.c: #include "e-corba-utils.h". * e-shell-startup-wizard.c: #include "e-shell-startup-wizard.h". * e-shell-startup-wizard.h: #include <glib.h> * e-summary-weather.c (weather_make_html): Make local variable `icon_name' const. Remove unused variable `uri'. * e-summary.h: Reformatted in GTK+ style. (e_summary_remove_online_connection): Added prototype. * e-summary-preferences.c (fill_mail_shown_clist): Constify local variable `name'. * e-summary-mail.c: #include "e-util/e-path.h". Updated to match the new studlyCapsification in shell/Evolution*.idl. * mail-local.c: Match the studlyCapsification of shell/Evolution*.idl. * mail-config-druid.h: Change type of `event_source' from `Bonobo_EventSource *' to `Bonobo_EventSource'. * mail-accounts.c (mail_delete): Remove unused local variable `label'. * folder-info.c (do_get_info): `#if 0' unused variables. * gui/component/addressbook-component.c: Get rid of a warning by initializing the closing NULL element in folder_types correctly. * gui/component/select-names/e-select-names.c: Updated to match the studlyCapsification of attributes in shell/Evolution*.idl. svn path=/trunk/; revision=12495
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/component/addressbook-component.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 46e9e7a6a7..ea74122399 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -67,7 +67,7 @@ static char *accepted_dnd_types[] = {
static const EvolutionShellComponentFolderType folder_types[] = {
{ "contacts", "evolution-contacts.png", N_("Contacts"), N_("Folder containing contact information"),
TRUE, accepted_dnd_types, NULL },
- { NULL, NULL, FALSE, NULL, NULL }
+ { NULL }
};
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 7a40a14c76..7316458630 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -361,11 +361,11 @@ new_folder (EvolutionStorageListener *storage_listener,
if (!strcmp(folder->type, "contacts")) {
ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);
e_folder->description = g_strdup(folder->description );
- e_folder->display_name = g_strdup(folder->display_name);
- if (!strncmp (folder->physical_uri, "file:", 5))
- e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physical_uri);
+ e_folder->display_name = g_strdup(folder->displayName);
+ if (!strncmp (folder->physicalUri, "file:", 5))
+ e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physicalUri);
else
- e_folder->uri = g_strdup(folder->physical_uri);
+ e_folder->uri = g_strdup(folder->physicalUri);
g_hash_table_insert(e_select_names->folders,
g_strdup(path), e_folder);
update_option_menu(e_select_names);