Commit 0690e03a authored by Christian Persch's avatar Christian Persch

widget: Remove deprecated vte_terminal_[gs]et_pty

Conflicts:
	src/vte.c
parent 9ba542ab
......@@ -96,10 +96,8 @@ vte_get_user_shell
<SUBSECTION>
vte_terminal_fork_command_full
vte_terminal_get_pty
vte_terminal_get_pty_object
vte_terminal_pty_new
vte_terminal_set_pty
vte_terminal_set_pty_object
vte_terminal_watch_child
......
......@@ -172,7 +172,6 @@ enum {
PROP_FONT_DESC,
PROP_ICON_TITLE,
PROP_MOUSE_POINTER_AUTOHIDE,
PROP_PTY,
PROP_PTY_OBJECT,
PROP_REWRAP_ON_RESIZE,
PROP_SCROLL_BACKGROUND,
......@@ -10866,9 +10865,6 @@ vte_terminal_get_property (GObject *object,
case PROP_MOUSE_POINTER_AUTOHIDE:
g_value_set_boolean (value, vte_terminal_get_mouse_autohide (terminal));
break;
case PROP_PTY:
g_value_set_int (value, pvt->pty != NULL ? vte_pty_get_fd(pvt->pty) : -1);
break;
case PROP_PTY_OBJECT:
g_value_set_object (value, vte_terminal_get_pty_object(terminal));
break;
......@@ -10988,9 +10984,6 @@ vte_terminal_set_property (GObject *object,
case PROP_MOUSE_POINTER_AUTOHIDE:
vte_terminal_set_mouse_autohide (terminal, g_value_get_boolean (value));
break;
case PROP_PTY:
vte_terminal_set_pty (terminal, g_value_get_int (value));
break;
case PROP_PTY_OBJECT:
vte_terminal_set_pty_object (terminal, g_value_get_object (value));
break;
......@@ -11958,23 +11951,6 @@ vte_terminal_class_init(VteTerminalClass *klass)
g_param_spec_boolean ("pointer-autohide", NULL, NULL,
FALSE,
G_PARAM_READWRITE | STATIC_PARAMS));
/**
* VteTerminal:pty:
*
* The file descriptor of the master end of the terminal's PTY.
*
* Since: 0.20
*
* Deprecated: 0.26: Use the #VteTerminal:pty-object property instead
*/
g_object_class_install_property
(gobject_class,
PROP_PTY,
g_param_spec_int ("pty", NULL, NULL,
-1, G_MAXINT,
-1,
G_PARAM_READWRITE | STATIC_PARAMS));
/**
* VteTerminal:pty-object:
......@@ -13631,36 +13607,6 @@ vte_terminal_get_current_file_uri(VteTerminal *terminal)
return terminal->pvt->current_file_uri;
}
/**
* vte_terminal_set_pty:
* @terminal: a #VteTerminal
* @pty_master: a file descriptor of the master end of a PTY, or %-1
*
* Attach an existing PTY master side to the terminal widget. Use
* instead of vte_terminal_fork_command() or vte_terminal_forkpty().
*
* Since: 0.12.1
*
* Deprecated: 0.26: Use vte_pty_new_foreign() and vte_terminal_set_pty_object()
*/
void
vte_terminal_set_pty(VteTerminal *terminal, int pty_master)
{
VtePty *pty;
if (pty_master == -1) {
vte_terminal_set_pty_object(terminal, NULL);
return;
}
pty = vte_pty_new_foreign(pty_master, NULL);
if (pty == NULL)
return;
vte_terminal_set_pty_object(terminal, pty);
g_object_unref(pty);
}
/**
* vte_terminal_set_pty_object:
* @terminal: a #VteTerminal
......@@ -13722,7 +13668,6 @@ vte_terminal_set_pty_object(VteTerminal *terminal,
if (pty == NULL) {
pvt->pty = NULL;
g_object_notify(object, "pty");
g_object_notify(object, "pty-object");
g_object_thaw_notify(object);
return;
......@@ -13750,38 +13695,11 @@ vte_terminal_set_pty_object(VteTerminal *terminal,
/* Open channels to listen for input on. */
_vte_terminal_connect_pty_read (terminal);
g_object_notify(object, "pty");
g_object_notify(object, "pty-object");
g_object_thaw_notify(object);
}
/**
* vte_terminal_get_pty:
* @terminal: a #VteTerminal
*
* Returns the file descriptor of the master end of @terminal's PTY.
*
* Return value: the file descriptor, or -1 if the terminal has no PTY.
*
* Since: 0.20
*
* Deprecated: 0.26: Use vte_terminal_get_pty_object() and vte_pty_get_fd()
*/
int
vte_terminal_get_pty(VteTerminal *terminal)
{
VteTerminalPrivate *pvt;
g_return_val_if_fail (VTE_IS_TERMINAL (terminal), -1);
pvt = terminal->pvt;
if (pvt->pty != NULL)
return vte_pty_get_fd(pvt->pty);
return -1;
}
/**
* vte_terminal_get_pty_object:
* @terminal: a #VteTerminal
......
......@@ -75,8 +75,6 @@ void vte_terminal_set_font_full(VteTerminal *terminal,
void vte_terminal_set_font_from_string_full(VteTerminal *terminal,
const char *name,
VteTerminalAntiAlias antialias) G_GNUC_DEPRECATED;
void vte_terminal_set_pty(VteTerminal *terminal, int pty_master);
int vte_terminal_get_pty(VteTerminal *terminal);
void vte_terminal_im_append_menuitems(VteTerminal *terminal,
GtkMenuShell *menushell) G_GNUC_DEPRECATED;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment