diff options
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-account-setup.c | 5 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-folder-size-display.c | 9 |
3 files changed, 11 insertions, 11 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index a9cd120d4b..9d0b9d6cb0 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2005-07-18 Sarfraaz Ahmed <asarfraaz@novell.com> + + * exchange-folder-size-display.c (parent_destroyed) : This is no longer + needed. gtk_widget_destroy will take care of destroying it. + Fixes #310699 + * exchange-account-setup.c (org_gnome_exchange_settings) : Fixed a + warning. Alignment cannot be set for a radio button + 2005-07-15 Shakti Sen <shprasad@novell.com> * exchange-folder-permission.c: Added the functions diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 8e7dd2e2e0..e0b949ba16 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -164,7 +164,8 @@ btn_fsize_clicked (GtkButton *button, gpointer data) account = acclist->data; model = exchange_account_folder_size_get_model (account); - exchange_folder_size_display (model, GTK_WIDGET (button)); + if (model) + exchange_folder_size_display (model, GTK_WIDGET (button)); } /* only used in editor */ @@ -278,8 +279,6 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), NULL); radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL); } - gtk_misc_set_alignment (GTK_MISC (radio_iof), 0, 0.5); - gtk_misc_set_alignment (GTK_MISC (radio_oof), 0, 0.5); gtk_signal_connect (GTK_OBJECT (radio_oof), "toggled", G_CALLBACK (toggled_state), NULL); diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c index a9a7247b7e..ebfa22cacc 100644 --- a/plugins/exchange-operations/exchange-folder-size-display.c +++ b/plugins/exchange-operations/exchange-folder-size-display.c @@ -63,12 +63,6 @@ format_size_func (GtkTreeViewColumn *col, g_free (new_text); } -static void -parent_destroyed (gpointer dialog, GObject *ex_parent) -{ - gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL); -} - void exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) { @@ -88,10 +82,10 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) g_return_if_fail (xml != NULL); dialog = glade_xml_get_widget (xml, "folder_tree"); table = glade_xml_get_widget (xml, "folder_treeview"); + g_object_unref (xml); e_dialog_set_transient_for (GTK_WINDOW (dialog), parent); /* fsize->parent = parent; */ - g_object_weak_ref (G_OBJECT (parent), parent_destroyed, dialog); /* Set up the table */ sortable = GTK_TREE_SORTABLE (model); @@ -118,5 +112,4 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent) GTK_TREE_MODEL (model)); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - g_object_unref (xml); } |