Commit 12bf32aa authored by Tristan Van Berkom's avatar Tristan Van Berkom

fixed build with gcc 2.x (again) (bug 469357).


	* gladeui/glade-editor-property.c: fixed build with gcc 2.x (again) (bug 469357).


svn path=/trunk/; revision=1580
parent 096c8bcd
2007-08-21 Jens Granseuer <jensgr@gmx.net>
* gladeui/glade-editor-property.c: fixed build with gcc 2.x (again) (bug 469357).
2007-08-21 Tristan Van Berkom <tvb@gnome.org> 2007-08-21 Tristan Van Berkom <tvb@gnome.org>
* NEWS, configure.ac: Rolling 3.3.4 * NEWS, configure.ac: Rolling 3.3.4
...@@ -1230,11 +1234,11 @@ ...@@ -1230,11 +1234,11 @@
* plugins/gtk+/gtk+.xml.in: added generic-name to GtkMenuShell. * plugins/gtk+/gtk+.xml.in: added generic-name to GtkMenuShell.
2006-02-15 Jens Granseuer <jensgr@gmx.net> 2007-02-15 Jens Granseuer <jensgr@gmx.net>
* Fixed sources to build with gcc 2.95 (bug 406504) * Fixed sources to build with gcc 2.95 (bug 406504)
2006-02-13 Tristan Van Berkom <tvb@gnome.org> 2007-02-13 Tristan Van Berkom <tvb@gnome.org>
* configure.in, NEWS: Rolling 3.1.5 * configure.in, NEWS: Rolling 3.1.5
......
...@@ -1332,6 +1332,8 @@ glade_eprop_named_icon_load (GladeEditorProperty *eprop, ...@@ -1332,6 +1332,8 @@ glade_eprop_named_icon_load (GladeEditorProperty *eprop,
GladeProperty *property) GladeProperty *property)
{ {
GladeEPropNamedIcon *eprop_named_icon = GLADE_EPROP_NAMED_ICON (eprop); GladeEPropNamedIcon *eprop_named_icon = GLADE_EPROP_NAMED_ICON (eprop);
GtkEntry *entry;
const gchar *text;
/* Chain up first */ /* Chain up first */
editor_property_class->load (eprop, property); editor_property_class->load (eprop, property);
...@@ -1339,8 +1341,8 @@ glade_eprop_named_icon_load (GladeEditorProperty *eprop, ...@@ -1339,8 +1341,8 @@ glade_eprop_named_icon_load (GladeEditorProperty *eprop,
if (property == NULL) if (property == NULL)
return; return;
GtkEntry *entry = GTK_ENTRY (eprop_named_icon->entry); entry = GTK_ENTRY (eprop_named_icon->entry);
const gchar *text = g_value_get_string (property->value); text = g_value_get_string (property->value);
gtk_entry_set_text (entry, text ? text : ""); gtk_entry_set_text (entry, text ? text : "");
} }
...@@ -1478,7 +1480,8 @@ static GtkWidget * ...@@ -1478,7 +1480,8 @@ static GtkWidget *
glade_eprop_named_icon_create_input (GladeEditorProperty *eprop) glade_eprop_named_icon_create_input (GladeEditorProperty *eprop)
{ {
GladeEPropNamedIcon *eprop_named_icon = GLADE_EPROP_NAMED_ICON (eprop); GladeEPropNamedIcon *eprop_named_icon = GLADE_EPROP_NAMED_ICON (eprop);
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *button;
hbox = gtk_hbox_new (FALSE, 0); hbox = gtk_hbox_new (FALSE, 0);
...@@ -1497,7 +1500,7 @@ glade_eprop_named_icon_create_input (GladeEditorProperty *eprop) ...@@ -1497,7 +1500,7 @@ glade_eprop_named_icon_create_input (GladeEditorProperty *eprop)
G_CALLBACK (glade_eprop_named_icon_focus_out), G_CALLBACK (glade_eprop_named_icon_focus_out),
eprop); eprop);
GtkWidget *button = gtk_button_new_with_label ("\342\200\246"); button = gtk_button_new_with_label ("\342\200\246");
gtk_widget_show (button); gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment