aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/contact-editor/fulladdr.glade2
-rw-r--r--addressbook/gui/component/addressbook.c5
-rw-r--r--addressbook/gui/contact-editor/fulladdr.glade2
-rw-r--r--addressbook/gui/search/e-addressbook-search-dialog.c2
5 files changed, 18 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 5906bf2677..f888957b47 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,15 @@
2000-09-11 Christopher James Lahey <clahey@helixcode.com>
+ * contact-editor/fulladdr.glade: Made this a bit better balanced.
+
+ * gui/component/addressbook.c: Make the toolbar button for find do
+ the same thing that the menu item for search does.
+
+ * gui/search/e-addressbook-search-dialog.c: Made the top half of
+ this not expand.
+
+2000-09-11 Christopher James Lahey <clahey@helixcode.com>
+
* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
Removed a bunch of redundant code. Made it so that when you set
an address label, it sets the delivery address as well. Added
diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade
index e1ba71bebd..46a3db23ca 100644
--- a/addressbook/contact-editor/fulladdr.glade
+++ b/addressbook/contact-editor/fulladdr.glade
@@ -274,6 +274,7 @@
<widget>
<class>GtkEntry</class>
<name>entry-code</name>
+ <width>100</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -347,6 +348,7 @@
<widget>
<class>GtkEntry</class>
<name>entry-ext</name>
+ <width>100</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 7037d41ee2..aca565e756 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -283,6 +283,7 @@ set_book(AddressbookView *view)
NULL);
}
+#if 0
static void
find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
{
@@ -312,8 +313,8 @@ find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
set_query (view, search_text);
g_free (search_text);
}
-
}
+#endif
static void
card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
@@ -437,7 +438,7 @@ static GnomeUIInfo gnome_toolbar [] = {
GNOMEUIINFO_SEPARATOR,
- GNOMEUIINFO_ITEM_STOCK (N_("Find"), N_("Find a contact"), find_contact_cb, GNOME_STOCK_PIXMAP_SEARCH),
+ GNOMEUIINFO_ITEM_STOCK (N_("Find"), N_("Find a contact"), search_cb, GNOME_STOCK_PIXMAP_SEARCH),
GNOMEUIINFO_ITEM_STOCK (N_("Print"), N_("Print contacts"), print_cb, GNOME_STOCK_PIXMAP_PRINT),
GNOMEUIINFO_ITEM_STOCK (N_("Delete"), N_("Delete a contact"), delete_contact_cb, GNOME_STOCK_PIXMAP_TRASH),
GNOMEUIINFO_SEPARATOR,
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
index e1ba71bebd..46a3db23ca 100644
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ b/addressbook/gui/contact-editor/fulladdr.glade
@@ -274,6 +274,7 @@
<widget>
<class>GtkEntry</class>
<name>entry-code</name>
+ <width>100</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
@@ -347,6 +348,7 @@
<widget>
<class>GtkEntry</class>
<name>entry-ext</name>
+ <width>100</width>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 35ba3e5334..ed324ba9c4 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -144,7 +144,7 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
view->search = get_widget(view);
- gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, FALSE, FALSE, 0);
gtk_widget_show(view->search);
button = gtk_button_new_with_label(_("Search"));