aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog22
-rw-r--r--addressbook/gui/component/addressbook-config.c39
-rw-r--r--addressbook/gui/component/ldap-config.glade44
3 files changed, 50 insertions, 55 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6e92275a49..6a4ed07a6e 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,27 @@
2003-03-18 Chris Toshok <toshok@ximian.com>
+ [ Fixes addressbook bug #39730 ]
+ * gui/component/ldap-config.glade: add response ids to the search
+ base dialog.
+
+ * gui/component/addressbook-config.c
+ (addressbook_source_dialog_destroy): use g_object_unref, not
+ gtk_widget_destroy, on the GladeXML.
+ (addressbook_add_server_druid): call gtk_window_set_type_hint
+ GDK_WINDOW_TYPE_HINT_DIALOG so this window looks like a dialog.
+ (editor_modify_cb): no more apply button.
+ (edit_dialog_apply_clicked): nuked.
+ (edit_dialog_close_clicked): rename to _cancal_clicked.
+ (edit_dialog_ok_clicked): call gtk_widget_destroy here instead of
+ calling _cancel_clicked.
+ (addressbook_edit_server_dialog): no more apply button, and
+ close_button -> cancel_button. Also, set the hint to
+ GDK_WINDOW_TYPE_HINT_DIALOG.
+ (ldap_dialog_new): fix compiler warning.
+ (addressbook_dialog_create_sources_table): same.
+
+2003-03-18 Chris Toshok <toshok@ximian.com>
+
* gui/component/select-names/e-select-names-section.etspec: use
alternating-row-colors="false"
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 7142c7be2b..31dff3a7bc 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -10,6 +10,7 @@
#include <config.h>
+#include <string.h>
#include <stdlib.h>
#include <sys/time.h>
@@ -181,8 +182,7 @@ struct _AddressbookSourceDialog {
/* stuff for the account editor window */
GtkTreeIter *source_model_row;
GtkWidget *ok_button;
- GtkWidget *apply_button;
- GtkWidget *close_button;
+ GtkWidget *cancel_button;
GtkWidget *advanced_button_notebook;
GtkWidget *notebook; /* the toplevel notebook */
@@ -362,7 +362,7 @@ addressbook_source_dialog_destroy (gpointer data, GObject *where_object_was)
dialog->source_model_row = NULL;
}
- gtk_widget_destroy (GTK_WIDGET (dialog->gui));
+ g_object_unref (dialog->gui);
g_free (dialog);
}
@@ -1102,6 +1102,7 @@ addressbook_add_server_druid (AddressbookDialog *dialog)
/* make sure we fill in the default values */
addressbook_source_dialog_set_source (sdialog, NULL);
+ gtk_window_set_type_hint (GTK_WINDOW (sdialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
gtk_widget_show_all (sdialog->window);
@@ -1125,7 +1126,6 @@ editor_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
#endif
gtk_widget_set_sensitive (dialog->ok_button, valid);
- gtk_widget_set_sensitive (dialog->apply_button, valid);
}
static void
@@ -1320,18 +1320,7 @@ edit_dialog_store_change (AddressbookSourceDialog *sdialog)
}
static void
-edit_dialog_apply_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
-{
- if (!edit_dialog_store_change (sdialog))
- return;
-
- /* resensitize the buttons */
- gtk_widget_set_sensitive (sdialog->ok_button, FALSE);
- gtk_widget_set_sensitive (sdialog->apply_button, FALSE);
-}
-
-static void
-edit_dialog_close_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
+edit_dialog_cancel_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
{
gtk_widget_destroy (sdialog->window);
}
@@ -1339,8 +1328,9 @@ edit_dialog_close_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
static void
edit_dialog_ok_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)
{
- if (edit_dialog_store_change (sdialog))
- edit_dialog_close_clicked (item, sdialog);
+ if (edit_dialog_store_change (sdialog)) {
+ gtk_widget_destroy (sdialog->window);
+ }
}
static AddressbookSourceDialog*
@@ -1398,8 +1388,7 @@ addressbook_edit_server_dialog (GtkTreeModel *model,
#endif
sdialog->ok_button = glade_xml_get_widget (sdialog->gui, "account-editor-ok-button");
- sdialog->apply_button = glade_xml_get_widget (sdialog->gui, "account-editor-apply-button");
- sdialog->close_button = glade_xml_get_widget (sdialog->gui, "account-editor-close-button");
+ sdialog->cancel_button = glade_xml_get_widget (sdialog->gui, "account-editor-cancel-button");
sdialog->advanced_button_notebook = glade_xml_get_widget (sdialog->gui, "account-editor-advanced-button-notebook");
fewer_options_button = glade_xml_get_widget (sdialog->gui, "account-editor-fewer-options-button");
@@ -1443,16 +1432,14 @@ addressbook_edit_server_dialog (GtkTreeModel *model,
g_signal_connect (sdialog->ok_button,
"clicked", G_CALLBACK(edit_dialog_ok_clicked), sdialog);
- g_signal_connect (sdialog->apply_button,
- "clicked", G_CALLBACK(edit_dialog_apply_clicked), sdialog);
- g_signal_connect (sdialog->close_button,
- "clicked", G_CALLBACK(edit_dialog_close_clicked), sdialog);
+ g_signal_connect (sdialog->cancel_button,
+ "clicked", G_CALLBACK(edit_dialog_cancel_clicked), sdialog);
g_object_weak_ref (G_OBJECT (sdialog->window),
addressbook_source_dialog_destroy, sdialog);
gtk_widget_set_sensitive (sdialog->ok_button, FALSE);
- gtk_widget_set_sensitive (sdialog->apply_button, FALSE);
+ gtk_window_set_type_hint (GTK_WINDOW (sdialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_window_set_modal (GTK_WINDOW (sdialog->window), TRUE);
gtk_widget_show (sdialog->window);
@@ -1567,7 +1554,6 @@ ldap_dialog_new (GNOME_Evolution_Shell shell)
{
AddressbookDialog *dialog;
GList *l;
- ETable *et;
GtkWidget *scrolled;
dialog = g_new0 (AddressbookDialog, 1);
@@ -1634,7 +1620,6 @@ addressbook_dialog_create_sources_table (char *name, char *string1, char *string
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
GtkListStore *model;
- char *titles[2];
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 8c1d3d4f41..46232e042d 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -1001,23 +1001,11 @@ LDAP attribute to associate with it.</property>
</child>
<child>
- <widget class="GtkButton" id="account-editor-apply-button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-apply</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="account-editor-close-button">
+ <widget class="GtkButton" id="account-editor-cancel-button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-close</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
@@ -1077,9 +1065,9 @@ need help finding this information.</property>
<widget class="GnomeDruidPageStandard" id="add-server-druid-info-page">
<property name="visible">True</property>
<property name="title" translatable="yes">Step 1: Server Information</property>
- <property name="title_foreground">#e700bfffe4b8</property>
- <property name="background">#3c0c0811e4b8</property>
- <property name="logo_background">#fa68081cc8cc</property>
+ <property name="title_foreground">#e6d0bfffe488</property>
+ <property name="background">#c5d80812e488</property>
+ <property name="logo_background">#a440081dc8cc</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="druid-vbox1">
@@ -1143,9 +1131,9 @@ information. Please ask your system administrator if you are unsure of this info
<widget class="GnomeDruidPageStandard" id="add-server-druid-connecting-page">
<property name="visible">True</property>
<property name="title" translatable="yes">Step 2: Connecting to Server</property>
- <property name="title_foreground">#e700bfffe4b8</property>
- <property name="background">#3c0c0811e4b8</property>
- <property name="logo_background">#fa68081cc8cc</property>
+ <property name="title_foreground">#e6d0bfffe488</property>
+ <property name="background">#c5d80812e488</property>
+ <property name="logo_background">#a440081dc8cc</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="druid-vbox2">
@@ -1210,9 +1198,9 @@ your connection. Ask your system administrator if your LDAP server uses these pr
<widget class="GnomeDruidPageStandard" id="add-server-druid-searching-page">
<property name="visible">True</property>
<property name="title" translatable="yes">Step 3: Searching the Directory</property>
- <property name="title_foreground">#e700bfffe4b8</property>
- <property name="background">#3c0c0811e4b8</property>
- <property name="logo_background">#fa68081cc8cc</property>
+ <property name="title_foreground">#e6d0bfffe488</property>
+ <property name="background">#c5d80812e488</property>
+ <property name="logo_background">#a440081dc8cc</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox23">
@@ -1277,9 +1265,9 @@ need to change these options.</property>
<widget class="GnomeDruidPageStandard" id="add-server-druid-display-name-page">
<property name="visible">True</property>
<property name="title" translatable="yes">Step 4: Display Name</property>
- <property name="title_foreground">#e700bfffe4b8</property>
- <property name="background">#3c0c0811e4b8</property>
- <property name="logo_background">#fa68081cc8cc</property>
+ <property name="title_foreground">#e6d0bfffe488</property>
+ <property name="background">#c5d80812e488</property>
+ <property name="logo_background">#a440081dc8cc</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="druid-vbox5">
@@ -5828,7 +5816,7 @@ searches, and for creating and editing contacts. </property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
</widget>
</child>
@@ -5840,7 +5828,7 @@ searches, and for creating and editing contacts. </property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-6</property>
</widget>
</child>
</widget>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 18:45:22 +0800