diff -ur synaptic-0.32/gtk/rgwindow.cc synaptic-0.32.gfree/gtk/rgwindow.cc --- synaptic-0.32/gtk/rgwindow.cc 2003-01-20 10:25:38 +0300 +++ synaptic-0.32.gfree/gtk/rgwindow.cc 2003-01-20 14:27:08 +0300 @@ -39,12 +39,12 @@ */ RGWindow::RGWindow(string name, bool makeBox, bool useGlade) { - gchar *filename; - if(!useGlade) { _win = gtk_window_new(GTK_WINDOW_TOPLEVEL); } else { // for development + gchar *filename = NULL; + filename = g_strdup_printf("window_%s.glade",name.c_str()); if(FileExists(filename)) { _gladeXML = glade_xml_new(filename, @@ -61,6 +61,7 @@ _win = glade_xml_get_widget(_gladeXML, g_strdup_printf ("window_%s",name.c_str())); assert(_win); + g_free(filename); }; gtk_window_set_title(GTK_WINDOW(_win), (char*)name.c_str()); @@ -78,7 +79,6 @@ _topBox = NULL; } - g_free(filename); gtk_widget_realize(_win); } @@ -86,11 +86,11 @@ RGWindow::RGWindow(RGWindow *parent, string name, bool makeBox, bool closable, bool useGlade) { - gchar *filename; if(!useGlade) { _win = gtk_window_new(GTK_WINDOW_TOPLEVEL); } else { // for development + gchar *filename = NULL; filename = g_strdup_printf("window_%s.glade",name.c_str()); if(FileExists(filename)) { _gladeXML = glade_xml_new(filename, @@ -107,6 +107,7 @@ _win = glade_xml_get_widget(_gladeXML, g_strdup_printf ("window_%s",name.c_str())); assert(_win); + g_free(filename); }; gtk_window_set_title(GTK_WINDOW(_win), (char*)name.c_str()); @@ -125,7 +126,6 @@ _topBox = NULL; } - g_free(filename); gtk_widget_realize(_win); gtk_window_set_transient_for(GTK_WINDOW(_win),