Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / fe-text / gui-expandos.c

diff --git a/apps/irssi/src/fe-text/gui-expandos.c b/apps/irssi/src/fe-text/gui-expandos.c
index b07bf129cacd44bf0d4ba3406ed8312c897db2e5..064a0955bde1a613988b82ee56a02c977bf413b5 100644 (file)
--- a/apps/irssi/src/fe-text/gui-expandos.c
+++ b/apps/irssi/src/fe-text/gui-expandos.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "module.h"
@@ -37,13 +37,15 @@ static char *expando_idletime(SERVER_REC *server, void *item, int *free_ret)
 /* current contents of the input line */
 static char *expando_inputline(SERVER_REC *server, void *item, int *free_ret)
 {
+       *free_ret = TRUE;
        return gui_entry_get_text(active_entry);
 }
 
 /* value of cutbuffer */
 static char *expando_cutbuffer(SERVER_REC *server, void *item, int *free_ret)
 {
-       return cutbuffer;
+       *free_ret = TRUE;
+       return gui_entry_get_cutbuffer(active_entry);
 }
 
 void gui_expandos_init(void)