summarylogtreecommitdiffstats
path: root/glabels-incompatible-pointer.patch
blob: cd176c33ea02bdc2281161548ab63d048e34b109 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
diff -up glabels-3.4.1/src/pixbuf-cache.c.incompatible-pointers glabels-3.4.1/src/pixbuf-cache.c
--- glabels-3.4.1/src/pixbuf-cache.c.incompatible-pointers	2023-12-01 12:02:31.164670658 +0100
+++ glabels-3.4.1/src/pixbuf-cache.c	2023-12-01 12:03:11.051169302 +0100
@@ -125,7 +125,7 @@ gl_pixbuf_cache_add_pixbuf (GHashTable *
 	record = g_new0 (CacheRecord, 1);
 	record->key        = g_strdup (name);
 	record->references = 0; /* Nobody has referenced it yet. */
-	record->pixbuf     = g_object_ref (G_OBJECT (pixbuf));
+	record->pixbuf     = g_object_ref (pixbuf);
 
 	g_hash_table_insert (pixbuf_cache, record->key, record);
 
diff -up glabels-3.4.1/src/ui-commands.c.incompatible-pointers glabels-3.4.1/src/ui-commands.c
--- glabels-3.4.1/src/ui-commands.c.incompatible-pointers	2023-12-01 12:01:45.373098191 +0100
+++ glabels-3.4.1/src/ui-commands.c	2023-12-01 12:01:46.730115156 +0100
@@ -1071,9 +1071,9 @@ gl_ui_cmd_objects_merge_properties (GtkA
         } else {
 
                 window->merge_dialog =
-                        g_object_ref (
+                        GL_MERGE_PROPERTIES_DIALOG (g_object_ref (
                                 gl_merge_properties_dialog_new (GL_VIEW(window->view)->label,
-                                                                GTK_WINDOW(window)) );
+                                                                GTK_WINDOW(window)) ));
 
                 g_signal_connect (G_OBJECT(window->merge_dialog), "destroy",
                                   G_CALLBACK (gtk_widget_destroyed),