1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
diff -up ./cmake/FindVTE.cmake.vte ./cmake/FindVTE.cmake
--- ./cmake/FindVTE.cmake.vte 2012-02-10 20:54:23.000000000 +0200
+++ ./cmake/FindVTE.cmake 2014-06-08 11:14:23.778316473 +0300
@@ -21,12 +21,10 @@ if(NOT _VTE_VERSION_NUM)
set(_VTE_LIB_NAME vte)
set(_VTE_VERSION vte)
else()
- set(_VTE_LIB_NAME vte${_VTE_VERSION_NUM})
+ set(_VTE_LIB_NAME vte-${_VTE_VERSION_NUM})
set(_VTE_VERSION vte-${_VTE_VERSION_NUM})
endif()
-string(REPLACE . _ _VTE_LIB_NAME ${_VTE_LIB_NAME})
-
pkg_check_modules(PC_VTE ${_VTE_VERSION})
find_path(VTE_INCLUDE_DIR NAMES vte/vte.h
diff -up ./remmina/CMakeLists.txt.vte ./remmina/CMakeLists.txt
--- ./remmina/CMakeLists.txt.vte 2014-06-08 11:14:23.634322160 +0300
+++ ./remmina/CMakeLists.txt 2014-06-08 11:14:23.777316512 +0300
@@ -120,7 +120,7 @@ if(AVAHI_FOUND)
endif()
if(GTK3_FOUND)
- set(_VTE_VERSION_NUM 2.90)
+ set(_VTE_VERSION_NUM 2.91)
else()
set(_VTE_VERSION_NUM)
endif()
diff -up ./remmina/src/remmina_ssh_plugin.c.vte ./remmina/src/remmina_ssh_plugin.c
--- ./remmina/src/remmina_ssh_plugin.c.vte 2012-02-10 20:54:23.000000000 +0200
+++ ./remmina/src/remmina_ssh_plugin.c 2014-06-08 11:43:08.341286290 +0300
@@ -169,7 +169,7 @@ remmina_plugin_ssh_set_vte_pref (Remmina
gpdata = (RemminaPluginSshData*) g_object_get_data (G_OBJECT(gp), "plugin-data");
if (remmina_pref.vte_font && remmina_pref.vte_font[0])
{
- vte_terminal_set_font_from_string (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_font);
+ vte_terminal_set_font (VTE_TERMINAL (gpdata->vte), pango_font_description_from_string (remmina_pref.vte_font));
}
vte_terminal_set_allow_bold (VTE_TERMINAL (gpdata->vte), remmina_pref.vte_allow_bold_text);
if (remmina_pref.vte_lines > 0)
@@ -205,7 +205,7 @@ remmina_plugin_ssh_init (RemminaProtocol
remmina_plugin_service->protocol_plugin_register_hostkey (gp, vte);
- vscrollbar = gtk_vscrollbar_new (vte_terminal_get_adjustment (VTE_TERMINAL (vte)));
+ vscrollbar = gtk_vscrollbar_new (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (vte)));
gtk_widget_show(vscrollbar);
gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0);
}
|
