aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2004-07-13 02:23:43 +0800
committerChris Toshok <toshok@src.gnome.org>2004-07-13 02:23:43 +0800
commit9b6df5d229e8e70afa3c1eee0297a5f42d234829 (patch)
tree944400cb6ca59f075cc11087b74daec39075f0fb
parente32aee64df4e58164851079e98e6e392a434f5cc (diff)
downloadgsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar.gz
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar.bz2
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar.lz
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar.xz
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.tar.zst
gsoc2013-evolution-9b6df5d229e8e70afa3c1eee0297a5f42d234829.zip
[ part of fix for bug #56520 ]
2004-07-12 Chris Toshok <toshok@ximian.com> [ part of fix for bug #56520 ] * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_init): init allows_contact_lists to TRUE. (list_deleted_cb): nuke, it's unused. (e_contact_list_editor_set_property): check if the book supports contact lists, and desensitize things if it doesn't. (select_names_ok_cb): this isn't valid C. declarations must come before code. (set_editable): the editable state of the dialog depends on whether or not the backend supports contact lists. (command_state_changed): the ok button needs to depend on allows_contact_lists. (extract_info): quiet compiler warning. * gui/contact-list-editor/e-contact-list-editor.h (struct _EContactListEditor): add allow_contact_lists. svn path=/trunk/; revision=26625
-rw-r--r--addressbook/ChangeLog20
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c61
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.h3
3 files changed, 53 insertions, 31 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 55483a857f..10c8089258 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,23 @@
+2004-07-12 Chris Toshok <toshok@ximian.com>
+
+ [ part of fix for bug #56520 ]
+
+ * gui/contact-list-editor/e-contact-list-editor.c
+ (e_contact_list_editor_init): init allows_contact_lists to TRUE.
+ (list_deleted_cb): nuke, it's unused.
+ (e_contact_list_editor_set_property): check if the book supports
+ contact lists, and desensitize things if it doesn't.
+ (select_names_ok_cb): this isn't valid C. declarations must come
+ before code.
+ (set_editable): the editable state of the dialog depends on
+ whether or not the backend supports contact lists.
+ (command_state_changed): the ok button needs to depend on
+ allows_contact_lists.
+ (extract_info): quiet compiler warning.
+
+ * gui/contact-list-editor/e-contact-list-editor.h (struct
+ _EContactListEditor): add allow_contact_lists.
+
2004-07-08 Frederic Crozat <fcrozat@mandrakesoft.com>
* gui/component/Makefile.am:
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 88980afed6..0bd1f2cc44 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -43,6 +43,7 @@
#include "widgets/misc/e-image-chooser.h"
#include "widgets/misc/e-source-option-menu.h"
+#include "addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.h"
#include "addressbook/gui/component/addressbook.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
#include "addressbook/util/eab-book-util.h"
@@ -196,6 +197,7 @@ e_contact_list_editor_init (EContactListEditor *editor)
editor->changed = FALSE;
editor->image_set = FALSE;
editor->editable = TRUE;
+ editor->allows_contact_lists = TRUE;
editor->in_async_call = FALSE;
editor->is_new_list = FALSE;
@@ -468,22 +470,6 @@ save_and_close_cb (GtkWidget *widget, EContactListEditor *cle)
}
static void
-list_deleted_cb (EBook *book, EBookStatus status, EContactListEditor *cle)
-{
- if (cle->app)
- gtk_widget_set_sensitive (cle->app, TRUE);
- cle->in_async_call = FALSE;
-
- eab_editor_contact_deleted (EAB_EDITOR (cle), status, cle->contact);
-
- /* always close the dialog after we successfully delete a list */
- if (status == E_BOOK_ERROR_OK)
- eab_editor_close (EAB_EDITOR (cle));
-
- g_object_unref (cle); /* release reference held for callback */
-}
-
-static void
contact_list_editor_destroy_notify (gpointer data,
GObject *where_the_object_was)
{
@@ -520,13 +506,26 @@ e_contact_list_editor_set_property (GObject *object, guint prop_id,
editor = E_CONTACT_LIST_EDITOR (object);
switch (prop_id){
- case PROP_BOOK:
+ case PROP_BOOK: {
+ gboolean changed;
+
if (editor->book)
g_object_unref (editor->book);
editor->book = E_BOOK(g_value_get_object (value));
g_object_ref (editor->book);
/* XXX more here about editable/etc. */
+
+ changed = (editor->allows_contact_lists != e_book_check_static_capability (editor->book,
+ "contact-lists"));
+ editor->allows_contact_lists = e_book_check_static_capability (editor->book,
+ "contact-lists");
+
+ if (changed) {
+ set_editable (editor);
+ command_state_changed (editor);
+ }
break;
+ }
case PROP_CONTACT:
if (editor->contact)
g_object_unref (editor->contact);
@@ -660,17 +659,17 @@ static void
select_names_ok_cb (BonoboListener *listener, const char *event_name, const CORBA_any *arg,
CORBA_Environment *ev, gpointer data)
{
+ EContactListEditor *ce;
EDestination **destv;
-
+ Bonobo_Control corba_control;
+ GtkWidget *control_widget;
char *string = NULL;
- EContactListEditor *ce;
-
ce = E_CONTACT_LIST_EDITOR (data);
- Bonobo_Control corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection
- (ce->corba_select_names, "Members", ev);
- GtkWidget *control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
+ corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (ce->corba_select_names,
+ "Members", ev);
+ control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);
bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations",
TC_CORBA_string, &string, NULL);
@@ -688,7 +687,6 @@ select_names_ok_cb (BonoboListener *listener, const char *event_name, const CORB
static gboolean
setup_corba (EContactListEditor *editor)
{
-
CORBA_Environment ev;
CORBA_exception_init (&ev);
@@ -829,11 +827,12 @@ visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)
static void
set_editable (EContactListEditor *editor)
{
- gtk_widget_set_sensitive (editor->email_entry, editor->editable);
- gtk_widget_set_sensitive (editor->list_name_entry, editor->editable);
- gtk_widget_set_sensitive (editor->add_button, editor->editable);
- gtk_widget_set_sensitive (editor->remove_button, editor->editable);
- gtk_widget_set_sensitive (editor->table, editor->editable);
+ gtk_widget_set_sensitive (editor->email_entry, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->list_name_entry, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->add_button, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->remove_button, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->select_button, editor->editable && editor->allows_contact_lists);
+ gtk_widget_set_sensitive (editor->table, editor->editable && editor->allows_contact_lists);
}
/* Callback used when the editor is destroyed */
@@ -948,7 +947,7 @@ command_state_changed (EContactListEditor *editor)
gboolean valid = eab_editor_is_valid (EAB_EDITOR (editor));
/* FIXME set the ok button to ok */
- gtk_widget_set_sensitive (editor->ok_button, valid);
+ gtk_widget_set_sensitive (editor->ok_button, valid && editor->allows_contact_lists);
gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list);
gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list);
}
@@ -985,7 +984,7 @@ extract_info(EContactListEditor *editor)
e_vcard_add_attribute (E_VCARD (contact), attr);
- e_destination_export_to_vcard_attribute (dest, attr);
+ e_destination_export_to_vcard_attribute ((EDestination*)dest, attr);
}
if (editor->image_set
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
index eb284b3fa4..ca6aef85bc 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -94,6 +94,9 @@ struct _EContactListEditor
/* Whether the contact editor will accept modifications */
guint editable : 1;
+ /* Whether the target book accepts storing of contact lists */
+ guint allows_contact_lists : 1;
+
/* Whether an async wombat call is in progress */
guint in_async_call : 1;