aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-27 10:39:19 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-27 10:39:19 +0800
commitfd57ebebf43ee3149efd8443996cde5d99490129 (patch)
tree5f45eba13968e6fc94035bdcd5fe1d1a58366874
parent83a54e15a95b22f91b5ef68a2687a7af9f9d1b43 (diff)
downloadgsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar.gz
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar.bz2
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar.lz
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar.xz
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.tar.zst
gsoc2013-evolution-fd57ebebf43ee3149efd8443996cde5d99490129.zip
remove redundant setting of y2.
2002-11-26 Chris Toshok <toshok@ximian.com> * gui/widgets/e-minicard.c (e_minicard_reflow): remove redundant setting of y2. * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_init): show the table. * gui/component/select-names/e-select-names-completion.c: remove an unnecessary #include. * gui/component/addressbook-storage.c (addressbook_storage_setup): use g_build_filename. * gui/component/addressbook-component.c (remove_folder): use g_build_filename. (add_creatable_item): same. (ensure_completion_uris_exist): same, and use the right gconf paths for completion uris. svn path=/trunk/; revision=18940
-rw-r--r--addressbook/ChangeLog20
-rw-r--r--addressbook/gui/component/addressbook-component.c12
-rw-r--r--addressbook/gui/component/addressbook-storage.c2
-rw-r--r--addressbook/gui/component/select-names/e-select-names-completion.c1
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c3
-rw-r--r--addressbook/gui/widgets/e-minicard.c6
6 files changed, 31 insertions, 13 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 4aea8b107a..6c4c6c6292 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,25 @@
2002-11-26 Chris Toshok <toshok@ximian.com>
+ * gui/widgets/e-minicard.c (e_minicard_reflow): remove redundant
+ setting of y2.
+
+ * gui/contact-list-editor/e-contact-list-editor.c
+ (e_contact_list_editor_init): show the table.
+
+ * gui/component/select-names/e-select-names-completion.c: remove
+ an unnecessary #include.
+
+ * gui/component/addressbook-storage.c (addressbook_storage_setup):
+ use g_build_filename.
+
+ * gui/component/addressbook-component.c (remove_folder): use
+ g_build_filename.
+ (add_creatable_item): same.
+ (ensure_completion_uris_exist): same, and use the right gconf
+ paths for completion uris.
+
+2002-11-26 Chris Toshok <toshok@ximian.com>
+
* gui/component/select-names/e-select-names-manager.c
(read_completion_books_from_db): use new schema for
completion/uris.
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 5773b5ba94..d727e9ac8e 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -161,7 +161,7 @@ remove_folder (EvolutionShellComponent *shell_component,
return;
}
- subdir_path = g_concat_dir_and_file (physical_uri + 7, "subfolders");
+ subdir_path = g_build_filename (physical_uri + 7, "subfolders", NULL);
rv = stat (subdir_path, &sb);
g_free (subdir_path);
if (rv != -1) {
@@ -172,7 +172,7 @@ remove_folder (EvolutionShellComponent *shell_component,
return;
}
- addressbook_db_path = g_concat_dir_and_file (physical_uri + 7, "addressbook.db");
+ addressbook_db_path = g_build_filename (physical_uri + 7, "addressbook.db", NULL);
rv = unlink (addressbook_db_path);
g_free (addressbook_db_path);
if (rv == 0) {
@@ -523,7 +523,7 @@ add_creatable_item (EvolutionShellComponent *shell_component,
icon_path = NULL;
icon = NULL;
} else {
- icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);
+ icon_path = g_build_filename (EVOLUTION_ICONSDIR, icon_name, NULL);
icon = gdk_pixbuf_new_from_file (icon_path, NULL);
}
@@ -592,7 +592,7 @@ ensure_completion_uris_exist()
db = e_book_get_config_database ();
- val = e_config_listener_get_string (db, "/Addressbook/Completion/uris");
+ val = e_config_listener_get_string (db, "/apps/evolution/addressbook/completion/uris");
if (!val) {
EFolderListItem f[2];
@@ -600,7 +600,7 @@ ensure_completion_uris_exist()
/* in the case where the user is running for the first
time, populate the list with the local contact
folder */
- dirname = gnome_util_prepend_user_home("evolution/local/Contacts");
+ dirname = g_build_filename (g_get_home_dir (), "evolution/local/Contacts", NULL);
uri = g_strdup_printf ("file://%s", dirname);
f[0].uri = "evolution:/local/Contacts";
@@ -613,7 +613,7 @@ ensure_completion_uris_exist()
g_free (dirname);
g_free (uri);
- e_config_listener_set_string (db, "/Addressbook/Completion/uris", val);
+ e_config_listener_set_string (db, "/apps/evolution/addressbook/completion/uris", val);
g_free (val);
}
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
index 6924052529..f83ffc4b70 100644
--- a/addressbook/gui/component/addressbook-storage.c
+++ b/addressbook/gui/component/addressbook-storage.c
@@ -97,7 +97,7 @@ addressbook_storage_setup (EvolutionShellComponent *shell_component,
if (storage_path)
g_free (storage_path);
- storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML);
+ storage_path = g_build_filename (evolution_homedir, ADDRESSBOOK_SOURCES_XML, NULL);
#ifdef HAVE_LDAP
if (!load_source_data (storage_path))
deregister_storage ();
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index 59c91049ad..602d6521b0 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -33,7 +33,6 @@
#include <math.h>
#include <gtk/gtksignal.h>
-#include <libgnome/gnome-util.h>
#include <addressbook/backend/ebook/e-book-util.h>
#include <addressbook/backend/ebook/e-destination.h>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 1605a69ae4..0fec8f00ee 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -227,6 +227,9 @@ e_contact_list_editor_init (EContactListEditor *editor)
editor->table = glade_xml_get_widget (gui, "contact-list-table");
editor->model = g_object_get_data (G_OBJECT(editor->table), "model");
+ /* XXX need this for libglade-2 it seems */
+ gtk_widget_show (editor->table);
+
editor->add_button = glade_xml_get_widget (editor->gui, "add-email-button");
editor->remove_button = glade_xml_get_widget (editor->gui, "remove-button");
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 6c8c9a630b..7f21f88f31 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -531,7 +531,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
e_minicard = E_MINICARD (item);
canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
+
switch( event->type ) {
case GDK_FOCUS_CHANGE:
{
@@ -948,10 +948,6 @@ e_minicard_reflow( GnomeCanvasItem *item, int flags )
e_minicard->height += 2;
gnome_canvas_item_set( e_minicard->rect,
- "y2", (double) e_minicard->height - 1,
- NULL );
-
- gnome_canvas_item_set( e_minicard->rect,
"x2", (double) e_minicard->width - 1.0,
"y2", (double) e_minicard->height - 1.0,
NULL );