diff options
Diffstat (limited to 'my-evolution')
| -rw-r--r-- | my-evolution/ChangeLog | 14 | ||||
| -rw-r--r-- | my-evolution/e-summary-mail.c | 6 | ||||
| -rw-r--r-- | my-evolution/e-summary-preferences.c | 5 | ||||
| -rw-r--r-- | my-evolution/e-summary-weather.c | 4 | ||||
| -rw-r--r-- | my-evolution/e-summary.h | 63 |
5 files changed, 59 insertions, 33 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 91391f7a2b..69b6521095 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,17 @@ +2001-08-27 Ettore Perazzoli <ettore@ximian.com> + + * 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. + 2001-08-23 Iain Holmes <iain@ximian.com> * e-summary-preferences.c (rdfs): Remove the 4 that don't work. diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c index 05fe7cfc6b..624b2b3c60 100644 --- a/my-evolution/e-summary-mail.c +++ b/my-evolution/e-summary-mail.c @@ -16,6 +16,8 @@ #include "e-summary.h" #include "e-summary-mail.h" +#include "e-util/e-path.h" + #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> /* gnome_util_prepend_user_home */ @@ -160,14 +162,14 @@ new_folder_cb (EvolutionStorageListener *listener, /* Don't care about non mail */ if (strcmp (folder->type, "mail") != 0 || - strncmp (folder->physical_uri, "file://", 7) != 0) { + strncmp (folder->physicalUri, "file://", 7) != 0) { return; } mail = summary->mail; mail_folder = g_new (ESummaryMailFolder, 1); - mail_folder->path = g_strdup (folder->physical_uri); + mail_folder->path = g_strdup (folder->physicalUri); mail_folder->name = g_strdup (path); mail_folder->count = -1; mail_folder->unread = -1; diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index cd11a8ece0..4a47b87b5b 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -618,7 +618,8 @@ fill_mail_shown_clist (GtkCList *clist, for (p = pd->summary->preferences->display_folders; p; p = p->next) { char *text[1]; - char *name, *uri; + char *uri; + const char *name; int row; uri = g_strconcat ("file://", p->data, NULL); @@ -627,7 +628,7 @@ fill_mail_shown_clist (GtkCList *clist, if (name == NULL) { text[0] = p->data; } else { - text[0] = name + 1; + text[0] = (char *) name + 1; /* GtkCList sucks. */ } row = gtk_clist_append (clist, text); gtk_clist_set_row_data (clist, row, p); diff --git a/my-evolution/e-summary-weather.c b/my-evolution/e-summary-weather.c index 990e0f8b8e..e1aa113095 100644 --- a/my-evolution/e-summary-weather.c +++ b/my-evolution/e-summary-weather.c @@ -97,8 +97,8 @@ weather_make_html (Weather *w) { GString *string; ESummaryWeatherLocation *location; - char *sky, *temp, *cond, *uri, *url, *s; - char *icon_name; + char *sky, *temp, *cond, *url, *s; + const char *icon_name; icon_name = icon_from_weather (w); string = g_string_new (""); diff --git a/my-evolution/e-summary.h b/my-evolution/e-summary.h index 9a19a6d20c..4fb4a8ef21 100644 --- a/my-evolution/e-summary.h +++ b/my-evolution/e-summary.h @@ -105,31 +105,40 @@ struct _ESummaryClass { GtkVBoxClass parent_class; }; -GtkType e_summary_get_type (void); -GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell); -void e_summary_print (GtkWidget *widget, - ESummary *summary); -void e_summary_reload (GtkWidget *widget, - ESummary *summary); -void e_summary_draw (ESummary *summary); -void e_summary_change_current_view (ESummary *summary, - const char *uri); -void e_summary_set_message (ESummary *summary, - const char *message, - gboolean busy); -void e_summary_unset_message (ESummary *summary); -void e_summary_add_protocol_listener (ESummary *summary, - const char *protocol, - ESummaryProtocolListener listener, - void *closure); -void e_summary_reconfigure (ESummary *summary); -int e_summary_count_connections (ESummary *summary); -GList *e_summary_add_connections (ESummary *summary); -void e_summary_set_online (ESummary *summary, - GNOME_Evolution_OfflineProgressListener listener, - gboolean online, - ESummaryOnlineCallback callback, - void *closure); -void e_summary_add_online_connection (ESummary *summary, - ESummaryConnection *connection); + +GtkType e_summary_get_type (void); +GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell); + +void e_summary_print (GtkWidget *widget, + ESummary *summary); +void e_summary_reload (GtkWidget *widget, + ESummary *summary); +void e_summary_draw (ESummary *summary); +void e_summary_change_current_view (ESummary *summary, + const char *uri); + +void e_summary_set_message (ESummary *summary, + const char *message, + gboolean busy); +void e_summary_unset_message (ESummary *summary); + +void e_summary_add_protocol_listener (ESummary *summary, + const char *protocol, + ESummaryProtocolListener listener, + void *closure); + +void e_summary_reconfigure (ESummary *summary); + +int e_summary_count_connections (ESummary *summary); +GList *e_summary_add_connections (ESummary *summary); +void e_summary_set_online (ESummary *summary, + GNOME_Evolution_OfflineProgressListener listener, + gboolean online, + ESummaryOnlineCallback callback, + void *closure); +void e_summary_add_online_connection (ESummary *summary, + ESummaryConnection *connection); +void e_summary_remove_online_connection (ESummary *summary, + ESummaryConnection *connection); + #endif |