+ Fixing rpm build.

+ Adding host URL as widget property.

+ Fixing rpm build.
+ Adding host URL as widget property.
Perry Werneck
1 parent 44fee5c5
Showing 4 changed files with 24 additions and 4 deletions Show diff stats
glade/v3270.xml.in
rpm/libv3270.spec
src/v3270/private.h
src/v3270/properties.c
@@ -4,6 +4,7 @@
     <glade-widget-class title="v3270 Terminal" name="v3270" generic-name="TN3270 Terminal">
       <properties>
         <property id="online"/>
+        <property id="url"/>
         <property id="selection"/>
         <property id="model"/>
         <property id="luname"/>
@@ -61,7 +61,7 @@ BuildRequires:  coreutils
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-devel
 BuildRequires:  m4
-BuildRequires:	libgladeui
+BuildRequires:	libgladeui-2-6
  
 %description
  
@@ -96,7 +96,7 @@ Summary:	Glade catalog for the TN3270 terminal emulator library
 Group:		Development/Libraries/C and C++
  
 Requires:	libv3270-devel = %{version}
-Requires:	libgladeui
+Requires:	glade
  
 %description -n glade-catalog-v3270
  
@@ -165,4 +165,4 @@ exit 0
 /sbin/ldconfig
 exit 0
  
 -%changelog
+%changelog
 \ No newline at end of file
@@ -215,6 +215,7 @@ G_BEGIN_DECLS
 	PROP_MODEL,
 	PROP_LUNAME,
 	PROP_AUTO_DISCONNECT,
+	PROP_URL,
  
 	/* Toggles - always the last one, the real values are PROP_TOGGLE+LIB3270_TOGGLE */
 	PROP_TOGGLE
@@ -63,6 +63,10 @@
 		v3270_set_auto_disconnect(GTK_WIDGET(object),g_value_get_int(value));
 		break;
  
+	case PROP_URL:
+		v3270_set_url(GTK_WIDGET(object),g_value_get_string(value));
+		break;
+
 	default:
 		if(prop_id < (PROP_TOGGLE + LIB3270_TOGGLE_COUNT))
 		{
@@ -100,6 +104,14 @@
 		g_value_set_boolean(value,lib3270_has_selection(window->host) ? TRUE : FALSE );
 		break;
  
+	case PROP_URL:
+		{
+			char buffer[1024];
+			memset(buffer,0,sizeof(buffer));
+			g_value_set_string(value,lib3270_get_url(window->host, buffer, sizeof(buffer)));
+		}
+		break;
+
 	default:
 		if(prop_id < (PROP_TOGGLE + LIB3270_TOGGLE_COUNT))
 		{
@@ -145,7 +157,6 @@
 					FALSE,G_PARAM_READABLE|G_PARAM_WRITABLE);
 	g_object_class_install_property(gobject_class,PROP_LUNAME,v3270_properties[PROP_LUNAME]);
  
-
 	v3270_properties[PROP_AUTO_DISCONNECT] = g_param_spec_string(
 					"auto_disconnect",
 					"auto_disconnect",
@@ -153,6 +164,13 @@
 					FALSE,G_PARAM_READABLE|G_PARAM_WRITABLE);
 	g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_AUTO_DISCONNECT]);
  
+	v3270_properties[PROP_URL] = g_param_spec_string(
+					"url",
+					"url",
+					"Host URL",
+					FALSE,G_PARAM_READABLE|G_PARAM_WRITABLE);
+	g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_URL]);
+
 	// Toggle properties
 	int f;
...	...	@@ -4,6 +4,7 @@
4	4	<glade-widget-class title="v3270 Terminal" name="v3270" generic-name="TN3270 Terminal">
5	5	<properties>
6	6	<property id="online"/>
	7	+ <property id="url"/>
7	8	<property id="selection"/>
8	9	<property id="model"/>
9	10	<property id="luname"/>
...	...
...	...	@@ -61,7 +61,7 @@ BuildRequires: coreutils
61	61	BuildRequires: gcc-c++
62	62	BuildRequires: gettext-devel
63	63	BuildRequires: m4
64		-BuildRequires: libgladeui
	64	+BuildRequires: libgladeui-2-6
65	65
66	66	%description
67	67
...	...	@@ -96,7 +96,7 @@ Summary: Glade catalog for the TN3270 terminal emulator library
96	96	Group: Development/Libraries/C and C++
97	97
98	98	Requires: libv3270-devel = %{version}
99		-Requires: libgladeui
	99	+Requires: glade
100	100
101	101	%description -n glade-catalog-v3270
102	102
...	...	@@ -165,4 +165,4 @@ exit 0
165	165	/sbin/ldconfig
166	166	exit 0
167	167
168	168	-%changelog
	169	+%changelog
169	170	\ No newline at end of file
...	...
...	...	@@ -215,6 +215,7 @@ G_BEGIN_DECLS
215	215	PROP_MODEL,
216	216	PROP_LUNAME,
217	217	PROP_AUTO_DISCONNECT,
	218	+ PROP_URL,
218	219
219	220	/* Toggles - always the last one, the real values are PROP_TOGGLE+LIB3270_TOGGLE */
220	221	PROP_TOGGLE
...	...
...	...	@@ -63,6 +63,10 @@
63	63	v3270_set_auto_disconnect(GTK_WIDGET(object),g_value_get_int(value));
64	64	break;
65	65
	66	+ case PROP_URL:
	67	+ v3270_set_url(GTK_WIDGET(object),g_value_get_string(value));
	68	+ break;
	69	+
66	70	default:
67	71	if(prop_id < (PROP_TOGGLE + LIB3270_TOGGLE_COUNT))
68	72	{
...	...	@@ -100,6 +104,14 @@
100	104	g_value_set_boolean(value,lib3270_has_selection(window->host) ? TRUE : FALSE );
101	105	break;
102	106
	107	+ case PROP_URL:
	108	+ {
	109	+ char buffer[1024];
	110	+ memset(buffer,0,sizeof(buffer));
	111	+ g_value_set_string(value,lib3270_get_url(window->host, buffer, sizeof(buffer)));
	112	+ }
	113	+ break;
	114	+
103	115	default:
104	116	if(prop_id < (PROP_TOGGLE + LIB3270_TOGGLE_COUNT))
105	117	{
...	...	@@ -145,7 +157,6 @@
145	157	FALSE,G_PARAM_READABLE\|G_PARAM_WRITABLE);
146	158	g_object_class_install_property(gobject_class,PROP_LUNAME,v3270_properties[PROP_LUNAME]);
147	159
148		-
149	160	v3270_properties[PROP_AUTO_DISCONNECT] = g_param_spec_string(
150	161	"auto_disconnect",
151	162	"auto_disconnect",
...	...	@@ -153,6 +164,13 @@
153	164	FALSE,G_PARAM_READABLE\|G_PARAM_WRITABLE);
154	165	g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_AUTO_DISCONNECT]);
155	166
	167	+ v3270_properties[PROP_URL] = g_param_spec_string(
	168	+ "url",
	169	+ "url",
	170	+ "Host URL",
	171	+ FALSE,G_PARAM_READABLE\|G_PARAM_WRITABLE);
	172	+ g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_URL]);
	173	+
156	174	// Toggle properties
157	175	int f;
158	176
...	...