diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/Makefile.am | 3 | ||||
| -rw-r--r-- | mail/component-factory.c | 4 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 4 | ||||
| -rw-r--r-- | mail/mail-local.c | 5 | ||||
| -rw-r--r-- | mail/mail-signature-editor.c | 5 | ||||
| -rw-r--r-- | mail/subscribe-dialog.c | 4 |
7 files changed, 25 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 8677d2f58d..6983858f4e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,16 @@ 2002-11-13 Not Zed <NotZed@Ximian.com> + * component-factory.c (owner_set_cb): destroy->weak ref. + (owner_set_cb): shell client changes. + + * mail-signature-editor.c (mail_signature_editor): bonobo api changes. + + * mail-local.c (save_metainfo): go back to using xmlSaveFile. + + * Makefile.am: Removed libevolution-importer from mail. + +2002-11-13 Not Zed <NotZed@Ximian.com> + * GNOME_Evolution_Mail.server.in.in: Added to cvs. Currently contains no configurable stuff, but maybe it will one day. diff --git a/mail/Makefile.am b/mail/Makefile.am index 224aee96ab..463115e9f3 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -149,10 +149,11 @@ evolution_mail_LDADD = \ $(top_builddir)/libversit/libversit.a \ $(top_builddir)/e-util/ename/libename.la \ $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/shell/importer/libevolution-importer.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_MAIL_LIBS) +# $(top_builddir)/shell/importer/libevolution-importer.la \ + evolution_mail_LDFLAGS = \ -export-dynamic diff --git a/mail/component-factory.c b/mail/component-factory.c index fe10799347..2efe6dc87b 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -752,7 +752,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, /* FIXME: should we ref this? */ global_shell_client = shell_client; - g_signal_connect(shell_client, "destroy", G_CALLBACK(shell_client_destroy), NULL); + g_object_weak_ref(G_OBJECT(shell_client), (GWeakNotify *)shell_client_destroy, NULL); evolution_dir = g_strdup (evolution_homedir); mail_session_init (); @@ -761,7 +761,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, storages_hash = g_hash_table_new (NULL, NULL); - corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)); + corba_shell = evolution_shell_client_corba_objref(shell_client); for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) *standard_folders[i].uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name); diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index a768550f17..9b89524424 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -3007,7 +3007,9 @@ footer_print_cb (GtkHTML *html, GnomePrintContext *print_context, if (info->local_font) { gchar *text = g_strdup_printf (_("Page %d of %d"), info->page_num, info->pages); - gdouble tw = gnome_font_get_width_string (info->local_font, text); + /*gdouble tw = gnome_font_get_width_string (info->local_font, text);*/ + /* FIXME: work out how to measure this */ + gdouble tw = strlen(text) * 8; gnome_print_gsave (print_context); gnome_print_newpath (print_context); diff --git a/mail/mail-local.c b/mail/mail-local.c index ccec409a06..5ddf5194c1 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -212,8 +212,9 @@ save_metainfo (struct _local_meta *meta) xmlSetProp(node, "type", meta->format); xmlSetProp(node, "name", meta->name); xmlSetProp(node, "index", meta->indexed?"1":"0"); - - ret = e_xml_save_file (meta->path, doc); + +#warning "xmlSaveFile used here" + ret = xmlSaveFile (meta->path, doc); xmlFreeDoc (doc); diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index c6bdf5a53c..a78804987a 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -325,9 +325,8 @@ mail_signature_editor (MailConfigSignature *sig) editor->win = bonobo_window_new ("e-sig-editor", _("Edit signature")); gtk_window_set_default_size (GTK_WINDOW (editor->win), DEFAULT_WIDTH, DEFAULT_HEIGHT); g_object_set(editor->win, "allow_shrink", FALSE, "allow_grow", TRUE, NULL); - - container = bonobo_ui_container_new (); - bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor->win)); + + container = bonobo_window_get_ui_container (BONOBO_WINDOW(editor->win)); component = bonobo_ui_component_new_default (); bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL); diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c index b4074df635..061dfaaa39 100644 --- a/mail/subscribe-dialog.c +++ b/mail/subscribe-dialog.c @@ -697,8 +697,8 @@ fe_sort_folder (ETreeMemory *etmm, ETreePath left, ETreePath right, gpointer use n_left = e_tree_memory_node_get_data (etmm, left); n_right = e_tree_memory_node_get_data (etmm, right); - /* TODO: not localised */ - return g_utf8_strcasecmp (ftree_node_get_name (n_left), ftree_node_get_name (n_right)); + /* if in utf8 locale ? */ + return strcasecmp (ftree_node_get_name (n_left), ftree_node_get_name (n_right)); } /* scanning */ |