]> git.pld-linux.org Git - packages/xfmedia.git/blame - xfmedia-exo-1.patch
projects / packages / xfmedia.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 6
[packages/xfmedia.git] / xfmedia-exo-1.patch
CommitLineData
099bf434
JR		 1--- xfmedia-0.9.2/configure.ac~ 2006-11-27 21:20:19.000000000 +0100
2+++ xfmedia-0.9.2/configure.ac 2011-02-23 14:37:22.012384549 +0100
3@@ -127,12 +127,9 @@
4 AC_MSG_RESULT([not found])
5 fi
6
7-dnl depend on libexo-0.3, with 0.2 as a fallback
8-XDT_CHECK_OPTIONAL_PACKAGE([EXO], [exo-0.3], [0.3.0], [exo],
9+dnl depend on libexo-1
10+XDT_CHECK_OPTIONAL_PACKAGE([EXO], [exo-1], [0.6.0], [exo],
11 [libexo extension library support (required)], [yes])
12-if test "x$EXO_FOUND" != "xyes"; then
13- XDT_CHECK_PACKAGE([EXO], [exo-0.2], [0.2.0])
14-fi
15
16 dnl optional
17 XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
18diff -ur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2-exo-1/src/mediamarks.c
19--- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 08:21:23.000000000 +0100
20+++ xfmedia-0.9.2-exo-1/src/mediamarks.c 2011-02-23 19:12:53.542911757 +0100
21@@ -682,11 +682,11 @@
22 gtk_tree_view_column_pack_start(col, render, FALSE);
23 gtk_tree_view_column_set_attributes(col, render, "pixbuf", MMADD_COL_ICON, NULL);
24
25- render = exo_cell_renderer_ellipsized_text_new();
26+ render = gtk_cell_renderer_text_new();
27 if(gtk_major_version == 2 && gtk_minor_version >= 6)
28- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
29+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
30 else {
31- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
32+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
33 "ellipsize-set", TRUE, NULL);
34 }
35 gtk_tree_view_column_pack_start(col, render, TRUE);
36@@ -1691,11 +1691,11 @@
37 gtk_tree_view_column_pack_start(col, render, FALSE);
38 gtk_tree_view_column_set_attributes(col, render, "pixbuf", MMEDIT_COL_ICON, NULL);
39
40- render = exo_cell_renderer_ellipsized_text_new();
41+ render = gtk_cell_renderer_text_new();
42 if(gtk_major_version == 2 && gtk_minor_version >= 6)
43- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
44+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
45 else {
46- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
47+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
48 "ellipsize-set", TRUE, NULL);
49 }
50 gtk_tree_view_column_pack_start(col, render, TRUE);
51@@ -1703,11 +1703,11 @@
52
53 gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
54
55- render = exo_cell_renderer_ellipsized_text_new();
56+ render = gtk_cell_renderer_text_new();
57 if(gtk_major_version == 2 && gtk_minor_version >= 6)
58- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
59+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
60 else {
61- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
62+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
63 "ellipsize-set", TRUE, NULL);
64 }
65 col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
66diff -ur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2-exo-1/src/playlist.c
67--- xfmedia-0.9.2/src/playlist.c 2006-11-27 08:21:22.000000000 +0100
68+++ xfmedia-0.9.2-exo-1/src/playlist.c 2011-02-23 19:13:37.703911724 +0100
69@@ -1407,11 +1407,11 @@
70 xfmedia_playlist_cell_render_title, plist, NULL);
71 gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
72
73- render = exo_cell_renderer_ellipsized_text_new();
74+ render = gtk_cell_renderer_text_new();
75 if(gtk_major_version == 2 && gtk_minor_version >= 6)
76- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
77+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
78 else {
79- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
80+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
81 "ellipsize-set", TRUE, NULL);
82 }
83 col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
84diff -ur xfmedia-0.9.2/src/playlist-files.c xfmedia-0.9.2-exo-1/src/playlist-files.c
85--- xfmedia-0.9.2/src/playlist-files.c 2006-11-27 08:21:23.000000000 +0100
86+++ xfmedia-0.9.2-exo-1/src/playlist-files.c 2011-02-23 19:15:58.357911723 +0100
87@@ -813,7 +813,7 @@
88
89 g_return_val_if_fail(original_uri && *original_uri, NULL);
90
91- md5sum = exo_str_get_md5_str(original_uri);
92+ md5sum = g_compute_checksum_for_string (G_CHECKSUM_MD5, original_uri, -1);
93
94 for(i = 0; cache_extensions[i]; i++) {
95 g_snprintf(buf, sizeof(buf), "xfmedia/cached-playlists/%s.%s", md5sum,
96@@ -841,7 +841,7 @@
97
98 g_return_val_if_fail(original_uri && *original_uri && data && *data, NULL);
99
100- md5sum = exo_str_get_md5_str(original_uri);
101+ md5sum = g_compute_checksum_for_string (G_CHECKSUM_MD5, original_uri, -1);
102
103 g_snprintf(buf, sizeof(buf), "xfmedia/cached-playlists/%s.%s", md5sum,
104 extension);
105diff -ur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2-exo-1/src/xfmedia-playlist-queue.c
106--- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 08:21:22.000000000 +0100
107+++ xfmedia-0.9.2-exo-1/src/xfmedia-playlist-queue.c 2011-02-23 19:14:33.025911717 +0100
108@@ -169,10 +169,9 @@
109 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(playlist_q->priv->treeview), FALSE);
110 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(playlist_q->priv->treeview), FALSE);
111
112- render = exo_cell_renderer_ellipsized_text_new();
113+ render = gtk_cell_renderer_text_new();
114 g_object_set(G_OBJECT(render),
115- "ellipsize", EXO_PANGO_ELLIPSIZE_END,
116- "ellipsize-set", TRUE,
117+ "ellipsize", PANGO_ELLIPSIZE_END,
118 NULL);
119 col = gtk_tree_view_column_new_with_attributes("display-name", render,
120 "text", COL_DISPLAY_NAME,
Xfmedia - lightweight media player based on the xine engine
This page took 0.080395 seconds and 4 git commands to generate.