wok-next view gens-gs/stuff/gens-gtk.patch @ rev 8837

Fixed taglib for new mixxx. Up: mixxx to 1.9.0.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Feb 24 11:45:20 2011 +0000 (2011-02-24)
parents
children
line source
1 diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
2 --- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000
3 +++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000
4 @@ -84,7 +84,7 @@
5 gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
6 gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
7 gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
8 - gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
9 + g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
10
11 // Callbacks for if the window is closed.
12 g_signal_connect((gpointer)about_window, "delete_event",
13 diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
14 --- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000
15 +++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000
16 @@ -84,7 +84,7 @@
17 gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
18 gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
19 gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
20 - gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
21 + g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
22
23 // Callbacks for if the window is closed.
24 g_signal_connect((gpointer)bmf_window, "delete_event",
25 diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
26 --- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000
27 +++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000
28 @@ -110,7 +110,7 @@
29 gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
30 gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
31 gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
32 - gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
33 + g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
34
35 // Callbacks for if the window is closed.
36 g_signal_connect((gpointer)(dir_window), "delete_event",
37 diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
38 --- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000
39 +++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000
40 @@ -138,7 +138,7 @@
41 gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
42 gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
43 gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
44 - gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
45 + g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
46
47 // Callbacks for if the window is closed.
48 g_signal_connect((gpointer)genopt_window, "delete_event",
49 diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
50 --- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000
51 +++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000
52 @@ -157,9 +157,9 @@
53 GSFT_UNUSED_PARAMETER(y);
54 GSFT_UNUSED_PARAMETER(user_data);
55
56 - if (context->targets)
57 + if (gdk_drag_context_list_targets(context))
58 {
59 - GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
60 + GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
61 gtk_drag_get_data(widget, context, target_type, time);
62 return true;
63 }
64 diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
65 --- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000
66 +++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000
67 @@ -75,7 +75,7 @@
68 gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
69 gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
70 gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
71 - gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
72 + g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
73
74 // Callbacks for if the window is closed.
75 g_signal_connect((gpointer)(glres_window), "delete_event",
76 diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
77 --- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000
78 +++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000
79 @@ -80,8 +80,7 @@
80 // Callbacks.
81 static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
82 static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
83 -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
84 - guint page_num, gpointer user_data);
85 +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
86 static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
87 static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
88
89 @@ -119,7 +118,7 @@
90 gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
91 gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
92 gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
93 - gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
94 + g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
95
96 // Callbacks for if the window is closed.
97 g_signal_connect((gpointer)pmgr_window, "delete_event",
98 @@ -559,11 +558,9 @@
99 * @param page_num New notebook page index.
100 * @param user_data User data.
101 */
102 -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
103 - guint page_num, gpointer user_data)
104 +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
105 {
106 GSFT_UNUSED_PARAMETER(notebook);
107 - GSFT_UNUSED_PARAMETER(page);
108 GSFT_UNUSED_PARAMETER(user_data);
109
110 // Activate the "cursor-changed" callback for the page.
111 diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
112 --- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000
113 +++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000
114 @@ -94,7 +94,7 @@
115 gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
116 gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
117 gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
118 - gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
119 + g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
120
121 // Callbacks for if the window is closed.
122 g_signal_connect((gpointer)(selcd_window), "delete_event",
123 diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
124 --- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000
125 +++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000
126 @@ -111,7 +111,7 @@
127 gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
128 gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
129 gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
130 - gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
131 + g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
132
133 // Add the window icon.
134 GList *icon_list = NULL;