diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
| commit | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (patch) | |
| tree | 20ce1a2fd0cebc36231882b011e34230778a1db9 /plugins/gtkui/ddbcellrenderertextmultiline.h | |
| parent | 527ba48d8209a8e854c791d571106a5daf2fdd29 (diff) | |
| parent | 708c8ba9f7aefe9f795c9c4eb30ab128f09c8b3d (diff) | |
Merge branch 'master' into devel
Conflicts:
README
configure.ac
deadbeef.h
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddblistview.c
plugins/gtkui/deadbeef.glade
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/shellexec/shellexec.c
plugins/supereq/Makefile.am
Diffstat (limited to 'plugins/gtkui/ddbcellrenderertextmultiline.h')
| -rw-r--r-- | plugins/gtkui/ddbcellrenderertextmultiline.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/gtkui/ddbcellrenderertextmultiline.h b/plugins/gtkui/ddbcellrenderertextmultiline.h index ca461f34..622a19a6 100644 --- a/plugins/gtkui/ddbcellrenderertextmultiline.h +++ b/plugins/gtkui/ddbcellrenderertextmultiline.h @@ -35,7 +35,6 @@ typedef struct _DdbCellRendererTextMultilinePrivate DdbCellRendererTextMultiline struct _DdbCellEditableTextView { GtkTextView parent_instance; DdbCellEditableTextViewPrivate * priv; - gboolean editing_canceled; gchar* tree_path; }; |