wok-6.x view xfmedia/stuff/xfmedia-exo-0.6.patch @ rev 16830

libfm: separate GTK part of libfm to libfm-gtk.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jul 12 14:22:26 2014 +0300 (2014-07-12)
parents
children
line source
1 diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
2 --- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000
3 +++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000
4 @@ -27417,7 +27417,7 @@
5
6
7 if test x"$xdt_cv_EXO_check" = x"yes"; then
8 - if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
9 + if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
10
11
12 # minimum supported version of pkg-config
13 @@ -27501,22 +27501,22 @@
14 fi
15
16
17 - { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
18 -echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
19 - if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
20 - EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
21 + { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
22 +echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
23 + if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
24 + EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
25 { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
26 echo "${ECHO_T}$EXO_VERSION" >&6; }
27
28 { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
29 echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
30 - EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
31 + EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
32 { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
33 echo "${ECHO_T}$EXO_CFLAGS" >&6; }
34
35 { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
36 echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
37 - EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
38 + EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
39 { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
40 echo "${ECHO_T}$EXO_LIBS" >&6; }
41
42 @@ -27535,15 +27535,15 @@
43
44 EXO_FOUND="yes"
45
46 - elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
47 - xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
48 + elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
49 + xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
50 { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
51 echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
52
53
54 - echo "*** The required package exo-0.3 was found on your system,"
55 + echo "*** The required package exo-1 was found on your system,"
56 echo "*** but the installed version ($xdt_cv_version) is too old."
57 - echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
58 + echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
59 echo "*** the PKG_CONFIG_PATH environment variable if you installed"
60 echo "*** the new version of the package in a nonstandard prefix so"
61 echo "*** pkg-config is able to find it."
62 @@ -27554,8 +27554,8 @@
63 echo "${ECHO_T}not found" >&6; }
64
65
66 - echo "*** The required package exo-0.3 was not found on your system."
67 - echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
68 + echo "*** The required package exo-1 was not found on your system."
69 + echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
70 echo "*** the PKG_CONFIG_PATH environment variable if you"
71 echo "*** installed the package in a nonstandard prefix so that"
72 echo "*** pkg-config is able to find it."
73 @@ -27564,14 +27564,14 @@
74 fi
75
76 else
77 - { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
78 -echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
79 + { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
80 +echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
81 { echo "$as_me:$LINENO: result: not found" >&5
82 echo "${ECHO_T}not found" >&6; }
83 fi
84 else
85 - { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
86 -echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
87 + { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
88 +echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
89 { echo "$as_me:$LINENO: result: disabled" >&5
90 echo "${ECHO_T}disabled" >&6; }
91 fi
92 diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
93 --- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000
94 +++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000
95 @@ -388,6 +388,23 @@
96 return optind;
97 }
98
99 +/**
100 + * exo_str_get_md5_str:
101 + * @contents : The string to create a digest of.
102 + *
103 + * Creates a character array MD5 digestof the string
104 + * @contents.
105 + *
106 + * Return value: A newly-allocated character array which
107 + * should be free with g_free() when no
108 + * longer needed.
109 + **/
110 +gchar*
111 +exo_str_get_md5_str (const gchar *contents)
112 +{
113 + return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
114 +}
115 +
116 int
117 main(int argc, char **argv)
118 {
119 diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
120 --- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000
121 +++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000
122 @@ -684,9 +684,9 @@
123
124 render = exo_cell_renderer_ellipsized_text_new();
125 if(gtk_major_version == 2 && gtk_minor_version >= 6)
126 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
127 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
128 else {
129 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
130 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
131 "ellipsize-set", TRUE, NULL);
132 }
133 gtk_tree_view_column_pack_start(col, render, TRUE);
134 @@ -1693,9 +1693,9 @@
135
136 render = exo_cell_renderer_ellipsized_text_new();
137 if(gtk_major_version == 2 && gtk_minor_version >= 6)
138 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
139 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
140 else {
141 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
142 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
143 "ellipsize-set", TRUE, NULL);
144 }
145 gtk_tree_view_column_pack_start(col, render, TRUE);
146 @@ -1705,9 +1705,9 @@
147
148 render = exo_cell_renderer_ellipsized_text_new();
149 if(gtk_major_version == 2 && gtk_minor_version >= 6)
150 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
151 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
152 else {
153 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
154 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
155 "ellipsize-set", TRUE, NULL);
156 }
157 col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
158 diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
159 --- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000
160 +++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000
161 @@ -1409,9 +1409,9 @@
162
163 render = exo_cell_renderer_ellipsized_text_new();
164 if(gtk_major_version == 2 && gtk_minor_version >= 6)
165 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
166 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
167 else {
168 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
169 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
170 "ellipsize-set", TRUE, NULL);
171 }
172 col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
173 diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
174 --- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000
175 +++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000
176 @@ -552,7 +552,7 @@
177 render = exo_cell_renderer_ellipsized_text_new();
178 col = gtk_tree_view_column_new_with_attributes("name", render,
179 "text", PLUGINS_NAME, NULL);
180 - g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
181 + g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
182 "ellipsize-set", TRUE, NULL);
183 gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
184
185 diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
186 --- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000
187 +++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000
188 @@ -171,7 +171,7 @@
189
190 render = exo_cell_renderer_ellipsized_text_new();
191 g_object_set(G_OBJECT(render),
192 - "ellipsize", EXO_PANGO_ELLIPSIZE_END,
193 + "ellipsize", PANGO_ELLIPSIZE_END,
194 "ellipsize-set", TRUE,
195 NULL);
196 col = gtk_tree_view_column_new_with_attributes("display-name", render,