Always initialize swap->timeout
This commit is contained in:
parent
0432fdeadc
commit
03b07477f8
|
@ -123,8 +123,8 @@ static Swap * _swap_init(PanelAppletHelper * helper, GtkWidget ** widget)
|
||||||
gtk_scale_set_value_pos(GTK_SCALE(swap->scale), GTK_POS_RIGHT);
|
gtk_scale_set_value_pos(GTK_SCALE(swap->scale), GTK_POS_RIGHT);
|
||||||
#endif
|
#endif
|
||||||
gtk_box_pack_start(GTK_BOX(swap->widget), swap->scale, FALSE, FALSE, 0);
|
gtk_box_pack_start(GTK_BOX(swap->widget), swap->scale, FALSE, FALSE, 0);
|
||||||
if(_swap_on_timeout(swap) == TRUE)
|
swap->timeout = (_swap_on_timeout(swap) == TRUE)
|
||||||
swap->timeout = g_timeout_add(timeout, _swap_on_timeout, swap);
|
? g_timeout_add(timeout, _swap_on_timeout, swap) : 0;
|
||||||
pango_font_description_free(desc);
|
pango_font_description_free(desc);
|
||||||
gtk_widget_show_all(swap->widget);
|
gtk_widget_show_all(swap->widget);
|
||||||
*widget = swap->widget;
|
*widget = swap->widget;
|
||||||
|
@ -135,7 +135,8 @@ static Swap * _swap_init(PanelAppletHelper * helper, GtkWidget ** widget)
|
||||||
/* swap_destroy */
|
/* swap_destroy */
|
||||||
static void _swap_destroy(Swap * swap)
|
static void _swap_destroy(Swap * swap)
|
||||||
{
|
{
|
||||||
g_source_remove(swap->timeout);
|
if(swap->timeout != 0)
|
||||||
|
g_source_remove(swap->timeout);
|
||||||
gtk_widget_destroy(swap->widget);
|
gtk_widget_destroy(swap->widget);
|
||||||
free(swap);
|
free(swap);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user