mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-02-27 14:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

GObject references should be unref'd in dispose

Browse source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2014-01-19 20:51:18 +01:00
parent 207f57b33b
commit 693f1d713a
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
page-widget.c
View file

@ -60,6 +60,7 @@ typedef struct zathura_page_widget_private_s {
static gboolean zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo); static gboolean zathura_page_widget_draw(GtkWidget* widget, cairo_t* cairo);
static void zathura_page_widget_finalize(GObject* object); static void zathura_page_widget_finalize(GObject* object);
static void zathura_page_widget_dispose(GObject* object);
static void zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec); static void zathura_page_widget_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec);
static void zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec); static void zathura_page_widget_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec);
static void zathura_page_widget_size_allocate(GtkWidget* widget, GdkRectangle* allocation); static void zathura_page_widget_size_allocate(GtkWidget* widget, GdkRectangle* allocation);
@ -114,6 +115,7 @@ zathura_page_widget_class_init(ZathuraPageClass* class)
widget_class->popup_menu = cb_zathura_page_widget_popup_menu; widget_class->popup_menu = cb_zathura_page_widget_popup_menu;
GObjectClass* object_class = G_OBJECT_CLASS(class); GObjectClass* object_class = G_OBJECT_CLASS(class);
object_class->dispose = zathura_page_widget_dispose;
object_class->finalize = zathura_page_widget_finalize; object_class->finalize = zathura_page_widget_finalize;
object_class->set_property = zathura_page_widget_set_property; object_class->set_property = zathura_page_widget_set_property;
object_class->get_property = zathura_page_widget_get_property; object_class->get_property = zathura_page_widget_get_property;
@ -218,6 +220,17 @@ zathura_page_widget_new(zathura_t* zathura, zathura_page_t* page)
return GTK_WIDGET(ret); return GTK_WIDGET(ret);
} }
static void
zathura_page_widget_dispose(GObject* object)
{
ZathuraPage* widget = ZATHURA_PAGE(object);
zathura_page_widget_private_t* priv = ZATHURA_PAGE_GET_PRIVATE(widget);
g_clear_object(&priv->render_request);
G_OBJECT_CLASS(zathura_page_widget_parent_class)->dispose(object);
}
static void static void
zathura_page_widget_finalize(GObject* object) zathura_page_widget_finalize(GObject* object)
{ {
@ -228,10 +241,6 @@ zathura_page_widget_finalize(GObject* object)
cairo_surface_destroy(priv->surface); cairo_surface_destroy(priv->surface);
} }
if (priv->render_request != NULL) {
g_object_unref(priv->render_request);
}
if (priv->search.list != NULL) { if (priv->search.list != NULL) {
girara_list_free(priv->search.list); girara_list_free(priv->search.list);
} }

26
render.c
View file

@ -21,6 +21,7 @@ G_DEFINE_TYPE(ZathuraRenderRequest, zathura_render_request, G_TYPE_OBJECT)
/* private methods for ZathuraRenderer */ /* private methods for ZathuraRenderer */
static void renderer_finalize(GObject* object); static void renderer_finalize(GObject* object);
/* private methods for ZathuraRenderRequest */ /* private methods for ZathuraRenderRequest */
static void render_request_dispose(GObject* object);
static void render_request_finalize(GObject* object); static void render_request_finalize(GObject* object);
static void render_job(void* data, void* user_data); static void render_job(void* data, void* user_data);
@ -203,6 +204,7 @@ zathura_render_request_class_init(ZathuraRenderRequestClass* class)
/* overwrite methods */ /* overwrite methods */
GObjectClass* object_class = G_OBJECT_CLASS(class); GObjectClass* object_class = G_OBJECT_CLASS(class);
object_class->dispose = render_request_dispose;
object_class->finalize = render_request_finalize; object_class->finalize = render_request_finalize;
request_signals[REQUEST_COMPLETED] = g_signal_new("completed", request_signals[REQUEST_COMPLETED] = g_signal_new("completed",
@ -269,25 +271,35 @@ zathura_render_request_new(ZathuraRenderer* renderer, zathura_page_t* page)
return request; return request;
} }
static void
render_request_dispose(GObject* object)
{
ZathuraRenderRequest* request = ZATHURA_RENDER_REQUEST(object);
request_private_t* priv = REQUEST_GET_PRIVATE(request);
if (priv->renderer != NULL) {
/* unregister the request */
renderer_unregister_request(priv->renderer, request);
/* release our private reference to the renderer */
g_clear_object(&priv->renderer);
}
G_OBJECT_CLASS(zathura_render_request_parent_class)->dispose(object);
}
static void static void
render_request_finalize(GObject* object) render_request_finalize(GObject* object)
{ {
ZathuraRenderRequest* request = ZATHURA_RENDER_REQUEST(object); ZathuraRenderRequest* request = ZATHURA_RENDER_REQUEST(object);
request_private_t* priv = REQUEST_GET_PRIVATE(request); request_private_t* priv = REQUEST_GET_PRIVATE(request);
if (priv->renderer) {
/* unregister the request */
renderer_unregister_request(priv->renderer, request);
/* release our private reference to the renderer */
g_object_unref(priv->renderer);
}
if (girara_list_size(priv->active_jobs) != 0) { if (girara_list_size(priv->active_jobs) != 0) {
girara_error("This should not happen!"); girara_error("This should not happen!");
} }
girara_list_free(priv->active_jobs); girara_list_free(priv->active_jobs);
mutex_free(&priv->jobs_mutex); mutex_free(&priv->jobs_mutex);
GOBJECT_CLASS(render_request_parent_class)->finalize(object); G_OBJECT_CLASS(zathura_render_request_parent_class)->finalize(object);
} }
/* renderer methods */ /* renderer methods */