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