Re: [evolution-patches] Exchange fix for #310699

[shakti <shprasad novell com>]

Patch looks good and also working fine.

One small thing: Just remove those two commented lines :)

-	gtk_misc_set_alignment (GTK_MISC (radio_iof), 0, 0.5);
-	gtk_misc_set_alignment (GTK_MISC (radio_oof), 0, 0.5);
+	//gtk_misc_set_alignment (GTK_MISC (radio_iof), 0, 0.5);
+	//gtk_misc_set_alignment (GTK_MISC (radio_oof), 0, 0.5);



Thanks,
Shakti


Sarfraaz Ahmed wrote:

> Hi,
>
> This fixes #310699 in exchange folder size plugin. The ChangeLog
> explains.
>
> Thanks
> -- Sarfraaz
>  
>
> ------------------------------------------------------------------------
>
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 ChangeLog
> --- ChangeLog	18 Jul 2005 11:57:37 -0000	1.23
> +++ ChangeLog	18 Jul 2005 14:59:33 -0000
> @@ -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 
> Index: exchange-account-setup.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 exchange-account-setup.c
> --- exchange-account-setup.c	18 Jul 2005 11:30:19 -0000	1.13
> +++ exchange-account-setup.c	18 Jul 2005 14:59:34 -0000
> @@ -164,7 +164,8 @@ btn_fsize_clicked (GtkButton *button, gp
> 	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,8 @@ org_gnome_exchange_settings(EPlugin *epl
> 		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_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);
> 	
>
> Index: exchange-folder-size-display.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-size-display.c,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 exchange-folder-size-display.c
> --- exchange-folder-size-display.c	14 Jul 2005 11:18:35 -0000	1.3
> +++ exchange-folder-size-display.c	18 Jul 2005 14:59:34 -0000
> @@ -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 (GtkListSto
>         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 (GtkListSto
>                                  GTK_TREE_MODEL (model));
> 	response = gtk_dialog_run (GTK_DIALOG (dialog));
>         gtk_widget_destroy (dialog);
> -        g_object_unref (xml);
> }
>  
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> evolution-patches mailing list
> evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches
>