StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

systemtrayicon: fixed multiple small leaks

Browse Source
This commit is contained in:
Dmytro Shynkevych 2015-10-04 19:51:51 -04:00
parent 2982bab991
commit 88cce4e137
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widget/systemtrayicon.cpp
View File

@ -76,6 +76,9 @@ SystemTrayIcon::SystemTrayIcon()
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
gtkIcon = gtk_status_icon_new_from_pixbuf(pixbuf);
g_object_unref(pixbuf);
gtkMenu = gtk_menu_new();
@ -114,6 +117,8 @@ SystemTrayIcon::SystemTrayIcon()
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
statusNotifier = status_notifier_new_from_pixbuf("qtox",
STATUS_NOTIFIER_CATEGORY_APPLICATION_STATUS, pixbuf);
@ -194,6 +199,9 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
item = gtk_image_menu_item_new_with_label(aText.toStdString().c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_pixbuf(pixbuf));
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item),TRUE);
@ -240,6 +248,9 @@ void SystemTrayIcon::setContextMenu(QMenu* menu)
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
item = gtk_image_menu_item_new_with_label(aText.toStdString().c_str());
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), gtk_image_new_from_pixbuf(pixbuf));
gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item),TRUE);
@ -374,6 +385,9 @@ void SystemTrayIcon::setIcon(QIcon &icon)
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
status_notifier_set_from_pixbuf(statusNotifier, STATUS_NOTIFIER_ICON, pixbuf);
g_object_unref(pixbuf);
}
@ -392,6 +406,9 @@ void SystemTrayIcon::setIcon(QIcon &icon)
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image->bits(), GDK_COLORSPACE_RGB, image->hasAlphaChannel(),
8, image->width(), image->height(),
image->bytesPerLine(), callbackFreeImage, image);
if(!pixbuf) // If pixbuf initialization fails, it won't trigger the callback.
delete image;
gtk_status_icon_set_from_pixbuf(gtkIcon, pixbuf);
g_object_unref(pixbuf);
}