aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c2
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.etspec2
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c6
4 files changed, 18 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 108f34d761..eed6877d3a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-20 Chris Toshok <toshok@ximian.com>
+
+ * gui/widgets/e-addressbook-view.etspec: use cursor-mode="line" to
+ get rid of the annoying cell cursor.
+
+ * gui/widgets/eab-gui-util.c (eab_create_image_chooser_widget):
+ create the image chooser even if we aren't given an initial
+ filename.
+
+ * gui/contact-editor/e-contact-editor.c (new_target_cb):
+ addressbook_show_load_error_dialog -> eab_load_error_dialog.
+
2004-04-19 Rodney Dawes <dobey@ximian.com>
* gui/contact-editor/contact-editor.glade: Set the default image for
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 1e25e06b54..8b247751c6 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -848,7 +848,7 @@ new_target_cb (EBook *new_book, EBookStatus status, EContactEditor *editor)
if (status != E_BOOK_ERROR_OK || new_book == NULL) {
GtkWidget *source_option_menu;
- addressbook_show_load_error_dialog (NULL, e_book_get_source (new_book), status);
+ eab_load_error_dialog (NULL, e_book_get_source (new_book), status);
source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source");
e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu),
diff --git a/addressbook/gui/widgets/e-addressbook-view.etspec b/addressbook/gui/widgets/e-addressbook-view.etspec
index 84f9ad44b8..8934900163 100644
--- a/addressbook/gui/widgets/e-addressbook-view.etspec
+++ b/addressbook/gui/widgets/e-addressbook-view.etspec
@@ -1,4 +1,4 @@
-<ETableSpecification draw-grid="true">
+<ETableSpecification draw-grid="true" cursor-mode="line">
<ETableColumn model_col= "2" _title="File As" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
<ETableColumn model_col= "3" _title="Full Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
<ETableColumn model_col= "4" _title="Given Name" expansion="1.0" minimum_width="75" resizable="true" cell="string" compare="string"/>
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index eed07a3621..5415aa1700 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -970,13 +970,15 @@ eab_create_image_chooser_widget(gchar *name,
{
char *filename;
GtkWidget *w = NULL;
+
+ w = e_image_chooser_new ();
+ gtk_widget_show_all (w);
+
if (string1) {
filename = e_icon_factory_get_icon_filename (string1, 48);
- w = e_image_chooser_new ();
e_image_chooser_set_from_file (E_IMAGE_CHOOSER (w), filename);
- gtk_widget_show_all (w);
g_free (filename);
}