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
|
Description: Port code to Gtk v2
Ifdef a few calls that changed between Gtk 2 and 3 to make
the program easier to backport.
Author: Petter Reinholdtsen <pere@hungry.com>
Forwarded: https://github.com/freetuxtv/freetuxtv/issues/200
Reviewed-By: Petter Reinholdtsen <pere@hungry.com>
Last-Update: 2016-06-02
--- freetuxtv-0.6.8.orig/src/freetuxtv-player-error-dialog.c
+++ freetuxtv-0.6.8/src/freetuxtv-player-error-dialog.c
@@ -61,7 +61,11 @@ freetuxtv_player_error_dialog_init (Free
//gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(pScroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GtkWidget* vbox;
+#if GTK_API_VERSION == 3
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+#else
+ vbox = gtk_vbox_new(FALSE, 5);
+#endif
gtk_box_pack_start (GTK_BOX (vbox),
GTK_WIDGET(pScroll), TRUE, TRUE, 5);
--- freetuxtv-0.6.8.orig/src/gtk-date-time-picker.c
+++ freetuxtv-0.6.8/src/gtk-date-time-picker.c
@@ -123,7 +123,11 @@ gtk_date_time_picker_init (GtkDateTimePi
NULL);*/
// Hour
+#if GTK_API_VERSION == 3
hbox_time = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#else
+ hbox_time = gtk_hbox_new(FALSE, 0);
+#endif
gtk_widget_show(hbox_time);
gtk_box_pack_start(GTK_BOX(object), hbox_time, FALSE, FALSE, 0);
--- freetuxtv-0.6.8.orig/src/gtk-progress-dialog.c
+++ freetuxtv-0.6.8/src/gtk-progress-dialog.c
@@ -87,7 +87,11 @@ gtk_progress_dialog_new(GtkWindow* paren
// Construct the dialog
GtkWidget* vbox;
+#if GTK_API_VERSION == 3
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
+#else
+ vbox = gtk_vbox_new(FALSE, 5);
+#endif
gtk_container_set_border_width (GTK_CONTAINER(vbox), 10);
priv->title_widget = gtk_label_new("");
|
