Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-dialog: fix memory leaks

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2014-12-08 12:33:41 -05:00
parent f8c269ac74
commit 738bb89d94
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-edit-dialog.c
+11 -4
View File
@@ -130,16 +130,18 @@ fill_sources_menu (GcalEditDialog *dialog)
GMenuItem *item; GMenuItem *item;
ESourceSelectable *extension; ESourceSelectable *extension;
GdkRGBA color; GdkRGBA color;
GdkPixbuf *pix;
source = E_SOURCE (aux->data); source = E_SOURCE (aux->data);
/* retrieve color */ /* retrieve color */
extension = E_SOURCE_SELECTABLE (e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR)); extension = E_SOURCE_SELECTABLE (e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR));
gdk_rgba_parse (&color, e_source_selectable_get_color (E_SOURCE_SELECTABLE (extension))); gdk_rgba_parse (&color, e_source_selectable_get_color (E_SOURCE_SELECTABLE (extension)));
pix = gcal_get_pixbuf_from_color (&color, 16);;
/* menu item */ /* menu item */
item = g_menu_item_new (e_source_get_display_name (source), "edit.select_calendar"); item = g_menu_item_new (e_source_get_display_name (source), "edit.select_calendar");
g_menu_item_set_icon (item, G_ICON (gcal_get_pixbuf_from_color (&color, 16))); g_menu_item_set_icon (item, G_ICON (pix));
/* set insensitive for read-only calendars */ /* set insensitive for read-only calendars */
if (gcal_manager_is_client_writable (priv->manager, source)) if (gcal_manager_is_client_writable (priv->manager, source))
@@ -149,10 +151,13 @@ fill_sources_menu (GcalEditDialog *dialog)
else else
{ {
g_menu_item_set_action_and_target_value (item, "edit.select_calendar", g_menu_item_set_action_and_target_value (item, "edit.select_calendar",
g_variant_new_string (e_source_dup_uid (source))); g_variant_new_string (e_source_get_uid (source)));
} }
g_menu_append_item (priv->sources_menu, item); g_menu_append_item (priv->sources_menu, item);
g_object_unref (pix);
g_object_unref (item);
} }
gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (priv->sources_button), G_MENU_MODEL (priv->sources_menu)); gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (priv->sources_button), G_MENU_MODEL (priv->sources_menu));
@@ -186,13 +191,15 @@ on_calendar_selected (GtkWidget *menu_item,
{ {
GdkRGBA color; GdkRGBA color;
ESourceSelectable *extension; ESourceSelectable *extension;
GdkPixbuf *pix;
/* retrieve color */ /* retrieve color */
extension = E_SOURCE_SELECTABLE (e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR)); extension = E_SOURCE_SELECTABLE (e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR));
gdk_rgba_parse (&color, e_source_selectable_get_color (E_SOURCE_SELECTABLE (extension))); gdk_rgba_parse (&color, e_source_selectable_get_color (E_SOURCE_SELECTABLE (extension)));
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->source_image), pix = gcal_get_pixbuf_from_color (&color, 16);
gcal_get_pixbuf_from_color (&color, 16)); gtk_image_set_from_pixbuf (GTK_IMAGE (priv->source_image), pix);
g_object_unref (pix);
priv->source = source; priv->source = source;
gtk_header_bar_set_subtitle (GTK_HEADER_BAR (priv->titlebar), gtk_header_bar_set_subtitle (GTK_HEADER_BAR (priv->titlebar),