X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=a85b80ba584b117365c2c31c4b718749cca6124c;hb=ac5fc2c85d86f1a14cdea0a215666ab39b44a1dc;hp=1ad77bc96ebf0190a633ca02b70179970980e3fb;hpb=3da49359c52cb783db907cc197847bbd5e721c97;p=pspp diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 1ad77bc96e..a85b80ba58 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007, 2009, 2010 Free Software Foundation + Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -208,9 +208,8 @@ connect_help (GtkBuilder *xml) GObject *o = i->data; if ( GTK_IS_WIDGET (o) ) { - gchar *name = NULL; + const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o)); gchar s[12] = {0}; - g_object_get (o, "name", &name, NULL); if ( name) strncpy (s, name, 11); @@ -282,8 +281,8 @@ on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr) return FALSE; } -void -paste_syntax_to_window (const gchar *syntax) +char * +paste_syntax_to_window (gchar *syntax) { static GtkWidget *the_syntax_pasteboard = NULL; @@ -304,6 +303,8 @@ paste_syntax_to_window (const gchar *syntax) gtk_text_buffer_end_user_action (buffer); gtk_widget_show (the_syntax_pasteboard); + + return syntax; }