callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Part of bug #504480 Possible leak fix. Function prototype changed and

Browse Source 
2008-01-04  Milan Crha  <mcrha@redhat.com>

	* Part of bug #504480
	* e-task-widget.c: (e_task_widget_construct):
	Possible leak fix.
	* e-task-widget.c: (e_task_widget_update_image):
	Function prototype changed and using parameter stock now.


svn path=/trunk/; revision=34759
This commit is contained in:
Milan Crha
2008-01-04 13:04:07 +00:00
committed by Milan Crha
parent df9b3d5711
commit 916cc41028
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/misc/ChangeLog
View File

@ -1,3 +1,11 @@
2008-01-04 Milan Crha <mcrha@redhat.com>
* Part of bug #504480
* e-task-widget.c: (e_task_widget_construct):
Possible leak fix.
* e-task-widget.c: (e_task_widget_update_image):
Function prototype changed and using parameter stock now.
2008-01-04 Matthew Barnes <mbarnes@redhat.com>
** Fix for bug #504480

9
widgets/misc/e-task-widget.c
View File

@ -164,8 +164,6 @@ e_task_widget_construct (ETaskWidget *task_widget,
GdkBitmap *mask;*/
GtkWidget *box;
GtkWidget *frame;
GtkWidget *image = e_icon_factory_get_image ("gtk-stop", E_ICON_SIZE_MENU);
GtkWidget *tool;
g_return_if_fail (task_widget != NULL);
g_return_if_fail (E_IS_TASK_WIDGET (task_widget));
@ -205,6 +203,9 @@ e_task_widget_construct (ETaskWidget *task_widget,
gtk_widget_show (priv->label);
gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0);
if (cancel_func) {
GtkWidget *image = e_icon_factory_get_image ("gtk-stop", E_ICON_SIZE_MENU);
GtkWidget *tool;
tool = (GtkWidget *) gtk_tool_button_new (image, NULL);
gtk_box_pack_end (GTK_BOX (box), tool, FALSE, TRUE, 0);
gtk_widget_show_all (tool);
@ -261,11 +262,11 @@ e_task_widget_new (GdkPixbuf *icon_pixbuf,
GtkWidget *
e_task_widget_update_image (ETaskWidget *task_widget,
char *stock, char *text)
const char *stock, const char *text)
{
GtkWidget *img, *tool;
img = e_icon_factory_get_image ("stock_dialog-warning", E_ICON_SIZE_MENU);
img = e_icon_factory_get_image (stock, E_ICON_SIZE_MENU);
tool = (GtkWidget *) gtk_tool_button_new (img, NULL);
gtk_box_pack_start (GTK_BOX(task_widget->priv->box), tool, FALSE, TRUE, 0);
gtk_widget_destroy (task_widget->priv->image);

2
widgets/misc/e-task-widget.h
View File

@ -76,7 +76,7 @@ void e_task_widget_update (ETaskWidget *task_widget,
double completion);
GtkWidget *
e_task_widget_update_image (ETaskWidget *task_widget,
char *stock, char *text);
const char *stock, const char *text);
void e_task_wiget_alert (ETaskWidget *task_widget);
void e_task_wiget_unalert (ETaskWidget *task_widget);