[gnome-mud] subwindow: Remove marshalling dependency
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mud] subwindow: Remove marshalling dependency
- Date: Thu, 27 Jul 2017 19:32:39 +0000 (UTC)
commit 5788c3eb1bdede16466f83573ee5de062ebc0ba5
Author: Steven Jackson <sj oscode net>
Date: Fri Apr 28 23:34:59 2017 +0100
subwindow: Remove marshalling dependency
This will enable simpler out of tree builds.
src/mud-subwindow.c | 6 ++----
src/zmp/zmp-subwindow.c | 7 +++----
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/mud-subwindow.c b/src/mud-subwindow.c
index f314922..11d1761 100644
--- a/src/mud-subwindow.c
+++ b/src/mud-subwindow.c
@@ -285,11 +285,9 @@ mud_subwindow_class_init (MudSubwindowClass *klass)
0,
NULL,
NULL,
- gnome_mud_cclosure_VOID__UINT_UINT,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
- 2,
- G_TYPE_UINT,
- G_TYPE_UINT);
+ 0);
mud_subwindow_signal[INPUT] =
g_signal_new("input-received",
diff --git a/src/zmp/zmp-subwindow.c b/src/zmp/zmp-subwindow.c
index 22cd665..6e87bff 100644
--- a/src/zmp/zmp-subwindow.c
+++ b/src/zmp/zmp-subwindow.c
@@ -83,8 +83,6 @@ static void zmp_subwindow_do_input(MudSubwindow *sub,
const gchar *input,
ZmpSubwindow *self);
static void zmp_subwindow_size(MudSubwindow *sub,
- guint width,
- guint height,
ZmpSubwindow *self);
/* Create the Type. We implement ZmpPackageInterface */
@@ -437,15 +435,16 @@ zmp_subwindow_do_input(MudSubwindow *sub,
static void
zmp_subwindow_size(MudSubwindow *sub,
- guint width,
- guint height,
ZmpSubwindow *self)
{
gchar *identifier;
gchar *w, *h;
+ gint width, height;
guint old_w, old_h;
g_object_get(sub,
+ "width", &width,
+ "height", &height,
"old-width", &old_w,
"old-height", &old_h,
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]