summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorManish Singh <yosh@src.gnome.org>1998-08-29 22:27:47 +0000
committerManish Singh <yosh@src.gnome.org>1998-08-29 22:27:47 +0000
commitf2322ebeb406ea20c4972ba38e57dc3b3f7a2fbe (patch)
treeffb04d99cac47bf819681afa46f38b580dde350e /gtk
parent1dafcb2a24bea9b0fc4de0e66ac90a3a5667ade7 (diff)
downloadgdk-pixbuf-f2322ebeb406ea20c4972ba38e57dc3b3f7a2fbe.tar.gz
quell some warnings with g_hash_table_new
* gdk/gdkcolor.c: (gdk_colormap_new) (gdk_colormap_get_system): quell some warnings with g_hash_table_new * gtk/gtkaccelgroup.c (gtk_accel_group_add): free the GtkSignalQuery when we're done with it * gtk/itemfactory.c: (gtk_item_factory_from_path): (gtk_item_factory_create_item): free some strings * gtk/gtklabel.c: (gtk_label_finalize): free label->pattern when done (gtk_label_parse_uline): null terminate pattern string, delete some duplicated code * gtk/testthreads.c: add #include <unistd.h> for sleep() -Yosh
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkaccelgroup.c2
-rw-r--r--gtk/gtkitemfactory.c7
-rw-r--r--gtk/gtklabel.c5
-rw-r--r--gtk/testthreads.c1
4 files changed, 12 insertions, 3 deletions
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 16895e79b..051ea1071 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -379,6 +379,8 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
return;
}
+ g_free (query);
+
/* prematurely abort if the group/entry is already locked
*/
if (accel_group->lock_count > 0)
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 74054e8b2..6a592a7f8 100644
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -628,6 +628,9 @@ gtk_item_factory_from_path (const gchar *path)
fname[i + 1] = 0;
item = g_hash_table_lookup (class->item_ht, fname);
+
+ g_free (fname);
+
if (item && item->widgets)
return gtk_item_factory_from_widget (item->widgets->data);
@@ -1006,7 +1009,7 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory,
if (!gtk_item_factory_parse_path (entry->path,
&path, &parent_path, &name))
return;
-
+
parent = gtk_item_factory_get_widget (ifactory, parent_path);
if (!parent)
{
@@ -1104,6 +1107,8 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory,
callback_type,
item_type_path,
widget);
+
+ g_free (path);
}
void
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9606ef549..3c920cd2b 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -315,6 +315,7 @@ gtk_label_finalize (GtkObject *object)
label = GTK_LABEL (object);
g_free (label->label);
+ if (label->pattern) g_free (label->pattern);
gtk_label_free_rows (label);
(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
@@ -590,7 +591,6 @@ gtk_label_parse_uline (GtkLabel *label,
p = string;
q = name;
r = pattern;
- underscore = FALSE;
while (*p)
{
@@ -621,7 +621,8 @@ gtk_label_parse_uline (GtkLabel *label,
p++;
}
*q = 0;
-
+ *r = 0;
+
gtk_label_set (label, name);
gtk_label_set_pattern (label, pattern);
diff --git a/gtk/testthreads.c b/gtk/testthreads.c
index 71527d13d..6ce38f369 100644
--- a/gtk/testthreads.c
+++ b/gtk/testthreads.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
+#include <unistd.h>
#include <gtk/gtk.h>
#include "../config.h"