rpms/logjam/F-13 logjam-4.5.3-bansheeclient.patch, NONE, 1.1 logjam-4.5.3-bz590291.patch, NONE, 1.1 logjam-4.5.3-extendURLopener.patch, NONE, 1.1 logjam-4.5.3-fix-MusicSource.patch, NONE, 1.1 logjam-4.5.3-twuser.patch, NONE, 1.1 logjam.spec, 1.60, 1.61

Tom Callaway spot at fedoraproject.org
Fri Jul 9 20:37:16 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/logjam/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5402/F-13

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-bansheeclient.patch logjam-4.5.3-bz590291.patch 
	logjam-4.5.3-extendURLopener.patch 
	logjam-4.5.3-fix-MusicSource.patch logjam-4.5.3-twuser.patch 
Log Message:
update to close all outstanding bz

logjam-4.5.3-bansheeclient.patch:
 .gitignore                               |    1 
 configure.in                             |    8 +++++++
 src/music.c                              |    1 
 src/music.h                              |    1 
 util/Makefile.am                         |    3 ++
 util/bansheeclient/Makefile.am           |    1 
 util/bansheeclient/logjam-banshee-client |   34 +++++++++++++++++++++++++++++++
 7 files changed, 49 insertions(+)

--- NEW FILE logjam-4.5.3-bansheeclient.patch ---
diff -up logjam-git/configure.in.BAD logjam-git/configure.in
--- logjam-git/configure.in.BAD	2010-07-09 16:01:11.524279448 -0400
+++ logjam-git/configure.in	2010-07-09 16:02:51.504258077 -0400
@@ -200,6 +200,12 @@ fi
 AC_SUBST(XMMS_LIBS)
 AC_SUBST(XMMS_CFLAGS)
 
+AC_ARG_WITH(banshee,
+  AC_HELP_STRING([--with-banshee], [build banshee helper (default yes)]),
+  , [with_banshee=yes])
+
+AM_CONDITIONAL(WITH_BANSHEE, test "$with_banshee" = "yes")
+
 dnl liblivejournal dependencies.
 MODULES="glib-2.0 gobject-2.0 libxml-2.0"
 PKG_CHECK_MODULES(LIVEJOURNAL, $MODULES)
@@ -226,6 +232,7 @@ AC_CONFIG_SUBDIRS(protocol/liblivejourna
 AC_CONFIG_FILES([Makefile po/Makefile.in
 doc/Makefile data/Makefile images/Makefile
 util/Makefile util/xmmsclient/Makefile
+util/bansheeclient/Makefile
 protocol/Makefile
 src/Makefile])
 AC_OUTPUT
@@ -250,6 +257,7 @@ if test "$network_backend" = "libxml"; t
   echo "        If you need these features, you must build with Curl."
 fi
 echo "    - XMMS helper: ${with_xmms}"
+echo "    - Banshee helper: ${with_banshee}"
 echo "    - SQLite3: ${with_sqlite3}"
 echo ""
 
diff -up logjam-git/.gitignore.BAD logjam-git/.gitignore
--- logjam-git/.gitignore.BAD	2010-07-09 16:00:57.217286443 -0400
+++ logjam-git/.gitignore	2010-07-09 16:01:03.391299418 -0400
@@ -76,5 +76,6 @@ src/cmdline_data.h
 src/logjam
 stamp-h1
 util/Makefile.in
+util/bansheeclient/Makefile.in
 util/xmmsclient/.deps/*
 util/xmmsclient/Makefile.in
diff -up logjam-git/src/music.c.BAD logjam-git/src/music.c
--- logjam-git/src/music.c.BAD	2010-07-09 16:03:01.729260002 -0400
+++ logjam-git/src/music.c	2010-07-09 16:03:28.044279373 -0400
@@ -16,6 +16,7 @@ JamDBus *jdbus = NULL;
 
 const CommandList music_commands[] = {
 	{ N_("None"), NULL },
+	{ "Banshee", "logjam-banshee-client" },
 	{ "Music Player Daemon", "sh -c \"mpc | grep -v '^volume: .* repeat: .* random: .*'\"" },
 	{ "Rhythmbox", "rhythmbox-client --print-playing" },
 	{ "XMMS / Beep", "logjam-xmms-client" },
diff -up logjam-git/src/music.h.BAD logjam-git/src/music.h
--- logjam-git/src/music.h.BAD	2010-07-09 16:03:33.644259403 -0400
+++ logjam-git/src/music.h	2010-07-09 16:03:50.353279658 -0400
@@ -14,6 +14,7 @@ extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
+	MUSIC_SOURCE_BANSHEE,
 	MUSIC_SOURCE_MPD,
 	MUSIC_SOURCE_RHYTHMBOX,
 	MUSIC_SOURCE_XMMS,
diff -up logjam-git/util/bansheeclient/logjam-banshee-client.BAD logjam-git/util/bansheeclient/logjam-banshee-client
--- logjam-git/util/bansheeclient/logjam-banshee-client.BAD	2010-07-09 16:06:15.527259054 -0400
+++ logjam-git/util/bansheeclient/logjam-banshee-client	2010-07-09 16:06:10.784268204 -0400
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+#
+# Detect music via banshee command line tool
+#
+# Author: Andy Shevchenko <andy.shevchenko at gmail.com>
+#
+
+# Run banshee-1 with given query parameter and substitute empty string to
+# Unknown. Now we are using following queries:
+#  current-state, artist, album, title
+function banshee_query()
+{
+  data=$(banshee-1 --query-$1 | cut -f2- -d' ')
+  if [ -z "$data" ]; then
+    data="Unknown"
+  fi
+  echo "$data"
+}
+
+# Check if banshee is running (it runs itself when found no running copy!)
+state="not running"
+if pidof banshee-1 > /dev/null; then
+  state=$(banshee_query current-state)
+fi
+
+# If current state is 'playing', print out song details
+if [ "$state" = "playing" ]; then
+  echo "$(banshee_query artist) - $(banshee_query album) - $(banshee_query title)"
+  exit 0
+fi
+
+echo "Banshee isn't active now, state: $state" >&2
+exit 1
diff -up logjam-git/util/bansheeclient/Makefile.am.BAD logjam-git/util/bansheeclient/Makefile.am
--- logjam-git/util/bansheeclient/Makefile.am.BAD	2010-07-09 16:04:47.552258495 -0400
+++ logjam-git/util/bansheeclient/Makefile.am	2010-07-09 16:04:43.050388891 -0400
@@ -0,0 +1 @@
+bin_SCRIPTS = logjam-banshee-client
diff -up logjam-git/util/Makefile.am.BAD logjam-git/util/Makefile.am
--- logjam-git/util/Makefile.am.BAD	2010-07-09 16:03:56.079257980 -0400
+++ logjam-git/util/Makefile.am	2010-07-09 16:04:15.433280285 -0400
@@ -5,3 +5,6 @@ if WITH_XMMS
 SUBDIRS += xmmsclient
 endif
 
+if WITH_BANSHEE
+SUBDIRS += bansheeclient
+endif

logjam-4.5.3-bz590291.patch:
 login.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE logjam-4.5.3-bz590291.patch ---
diff -up logjam-git/src/login.c.BAD logjam-git/src/login.c
--- logjam-git/src/login.c.BAD	2010-07-09 16:07:45.116268344 -0400
+++ logjam-git/src/login.c	2010-07-09 16:08:02.746258567 -0400
@@ -293,7 +293,7 @@ login_check_lastupdate(GtkWindow *parent
 	JamAccount *acc = JAM_ACCOUNT(acclj);
 
 	if (!conf.options.showloginhistory)
-		return TRUE;
+		return login_run(NULL, acclj);
 
 	deltat = time(NULL) - acclj->lastupdate;
 	if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */

logjam-4.5.3-extendURLopener.patch:
 spawn.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE logjam-4.5.3-extendURLopener.patch ---
diff -up logjam-git/src/spawn.c.BAD logjam-git/src/spawn.c
--- logjam-git/src/spawn.c.BAD	2010-07-09 16:09:33.525269112 -0400
+++ logjam-git/src/spawn.c	2010-07-09 16:11:19.535298581 -0400
@@ -32,10 +32,16 @@ spawn_url(GtkWindow *parent, const char 
  * when sending remote commands,
  * mozilla returns 0 on success and nonzero on failure. */
 const CommandList spawn_commands[] = {
+	{ "Freedesktop URL opener",
+	  "xdg-open '%s'" },
 	{ "GNOME Browser",
 	  "gnome-open '%s'" },
 	{ "Mozilla Firefox",
 	  "firefox '%s'" },
+	{ "Google Chrome",
+	  "google-chrome '%s'" },
+	{ "Chromium",
+	  "chromium-browser '%s'" },
 	{ "Debian (sensible-browser)",
 	  "sensible-browser '%s'" },
 	{ "Galeon",

logjam-4.5.3-fix-MusicSource.patch:
 music.c |    2 +-
 music.h |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE logjam-4.5.3-fix-MusicSource.patch ---
diff -up logjam-git/src/music.c.b500b3995295f728a52c logjam-git/src/music.c
--- logjam-git/src/music.c.b500b3995295f728a52c	2010-07-09 15:57:49.701294887 -0400
+++ logjam-git/src/music.c	2010-07-09 15:58:15.125288108 -0400
@@ -30,7 +30,7 @@ music_current_source(void) {
 	if (!conf.music_command)
 		return MUSIC_SOURCE_NONE;
 
-	for (i = 0; i < MUSIC_SOURCE_COUNT; i++) {
+	for (i = 0; i < MUSIC_SOURCE_COUNT - 1; i++) {
 		if (music_commands[i].label && music_commands[i].command &&
 				(strcmp(music_commands[i].command, conf.music_command) == 0))
 			return i;
diff -up logjam-git/src/music.h.b500b3995295f728a52c logjam-git/src/music.h
--- logjam-git/src/music.h.b500b3995295f728a52c	2010-07-09 15:58:20.583291394 -0400
+++ logjam-git/src/music.h	2010-07-09 15:59:10.816270718 -0400
@@ -14,10 +14,12 @@ extern JamDBus *jdbus;
 
 typedef enum {
 	MUSIC_SOURCE_NONE,
-	MUSIC_SOURCE_XMMS,
+	MUSIC_SOURCE_MPD,
 	MUSIC_SOURCE_RHYTHMBOX,
+	MUSIC_SOURCE_XMMS,
+	MUSIC_SOURCE_AMAROK,
+	MUSIC_SOURCE_COUNT,
 	MUSIC_SOURCE_CUSTOM,
-	MUSIC_SOURCE_COUNT
 } MusicSource;
 
 extern const CommandList music_commands[];

logjam-4.5.3-twuser.patch:
 images/Makefile.am          |    2 ++
 images/build-build-win32.sh |    2 ++
 images/build.bat            |    2 +-
 images/inline-images.rb     |    2 +-
 images/inline.h             |   34 ++++++++++++++++++++++++++++++++++
 images/logjam_twuser.png    |binary
 src/icons.c                 |    1 +
 src/link-journal.c          |   27 +++++++++++++++++++++++++++
 8 files changed, 75 insertions(+), 2 deletions(-)

--- NEW FILE logjam-4.5.3-twuser.patch ---
diff -up logjam-git/images/build.bat.BAD logjam-git/images/build.bat
--- logjam-git/images/build.bat.BAD	2010-07-09 16:14:58.400295023 -0400
+++ logjam-git/images/build.bat	2010-07-09 16:15:43.006298651 -0400
@@ -1 +1 @@
-gdk-pixbuf-csource --raw --build-list 	logjam_throbber_1    ./logjam_throbber_1.png   	logjam_throbber_2    ./logjam_throbber_2.png   	logjam_throbber_3    ./logjam_throbber_3.png   	logjam_throbber_4    ./logjam_throbber_4.png   	logjam_throbber_5    ./logjam_throbber_5.png   	logjam_throbber_6    ./logjam_throbber_6.png   	logjam_throbber_7    ./logjam_throbber_7.png   	logjam_throbber_8    ./logjam_throbber_8.png 	logjam_ljuser        ./logjam_ljuser.png       	logjam_ljcomm        ./logjam_ljcomm.png       	logjam_private       ./logjam_private.png      	logjam_protected     ./logjam_protected.png    	logjam_pencil        ./logjam_pencil.png       	logjam_music         ./logjam_music.png        	logjam_mood          ./logjam_mood.png         	logjam_rarrow        ./logjam_rarrow.png       	logjam_larrow        ./logjam_larrow.png       	logjam_lrarrow       ./logjam_lrarrow.png      	logjam_goat          ./logjam_goat.png         	logjam_cfriends_on   ./logjam_cfriends_o
 n.png  	logjam_cfriends_off  ./logjam_cfriends_off.png 	logjam_cfriends_new  ./logjam_cfriends_new.png >./pixbufs.h
+gdk-pixbuf-csource --raw --build-list 	logjam_throbber_1    ./logjam_throbber_1.png   	logjam_throbber_2    ./logjam_throbber_2.png   	logjam_throbber_3    ./logjam_throbber_3.png   	logjam_throbber_4    ./logjam_throbber_4.png   	logjam_throbber_5    ./logjam_throbber_5.png   	logjam_throbber_6    ./logjam_throbber_6.png   	logjam_throbber_7    ./logjam_throbber_7.png   	logjam_throbber_8    ./logjam_throbber_8.png 	logjam_ljuser        ./logjam_ljuser.png       	logjam_ljcomm        ./logjam_ljcomm.png       	logjam_twuser        ./logjam_twuser.png       logjam_private       ./logjam_private.png      	logjam_protected     ./logjam_protected.png    	logjam_pencil        ./logjam_pencil.png       	logjam_music         ./logjam_music.png        	logjam_mood          ./logjam_mood.png         	logjam_rarrow        ./logjam_rarrow.png       	logjam_larrow        ./logjam_larrow.png       	logjam_lrarrow       ./logjam_lrarrow.png      	logjam_goat          ./logjam_goat.png   
       	logjam_cfriends_on   ./logjam_cfriends_on.png  	logjam_cfriends_off  ./logjam_cfriends_off.png 	logjam_cfriends_new  ./logjam_cfriends_new.png >./pixbufs.h
diff -up logjam-git/images/build-build-win32.sh.BAD logjam-git/images/build-build-win32.sh
--- logjam-git/images/build-build-win32.sh.BAD	2010-07-09 16:14:12.325299144 -0400
+++ logjam-git/images/build-build-win32.sh	2010-07-09 16:14:50.860303822 -0400
@@ -3,6 +3,7 @@ srcdir=.
 IMAGES="\
 	logjam_ljuser.png     \
 	logjam_ljcomm.png     \
+	logjam_twuser.png     \
 	logjam_private.png    \
 	logjam_protected.png  \
 	logjam_pencil.png     \
@@ -27,6 +28,7 @@ IMAGES="\
 LIST="\
 	logjam_ljuser        $srcdir/logjam_ljuser.png       \
 	logjam_ljcomm        $srcdir/logjam_ljcomm.png       \
+	logjam_twuser        $srcdir/logjam_twuser.png       \
 	logjam_private       $srcdir/logjam_private.png      \
 	logjam_protected     $srcdir/logjam_protected.png    \
 	logjam_pencil        $srcdir/logjam_pencil.png       \
diff -up logjam-git/images/inline.h.BAD logjam-git/images/inline.h
--- logjam-git/images/inline.h.BAD	2010-07-09 16:16:12.191258215 -0400
+++ logjam-git/images/inline.h	2010-07-09 16:17:52.234258150 -0400
@@ -29,6 +29,40 @@ static const guint8 logjam_ljcomm_png[] 
     "\376c1\347\003\331\354\001\244A\2313M\000\000\000\000IEND\256B`\202"
 };
 
+static const guint8 logjam_twuser_png[] = {
+    "\211PNG\015\012\032\012\000\000\000\015IHDR\000\000\000\020\000\000\000\020"
+    "\010\006\000\000\000\037\363\377a\000\000\000\006bKGD\000\376\000\376\000"
+    "\376\353\030\324\202\000\000\000\011pHYs\000\000\000H\000\000\000H\000F\311"
+    "k>\000\000\000\011vpAg\000\000\000\020\000\000\000\020\000\\\306\255\303\000"
+    "\000\002GIDAT8\313\215\223\273nSA\020\206\277\231]\3371QL\270F\001\204H\001"
+    "J\201\270<\000\206\216\027\240C\240\244\245\240\305\251\"(\220h\240#\357\300"
+    "K\320!(\270H\\\024\001\002!q\261Mb\307\306\3669\273Cq\034;\351X\351\327j\265"
+    "\243\177\276\371\265+\215F\203\265\265\265\032p\0338\316\377\255\257\300\243"
+    "\325\325\325\266\230Y\341\376\306\350\205\037\366\226Z\243\200\031\210\310"
+    "\264T\000\333{<PP\206\271\362\333\306b\341\242\007\256\310\240\273\264\261"
+    "\235\"\002\027jE\352G\312t\323\310\323o\333\264\206\001v<,\333\377\214RNT"
+    "\342\022\024\352\012\324\372!\022\314\230+:n\234\236\241\\\362\314W\013\334"
+    "<\265\237\010D\203hF\300\010\226i\020\014\240\346\001B\314.\347K\236~\204"
+    "\315\000\001\343l%G\375p\011\200a4^\266\007tG\22186\002\360\000\315\301\220"
+    "\355\204q\007\330\312\250\371\025\240>_%\2163\270v\254\302\335WM\232\203\224"
+    "\026aj\360g\230\360\2457b\261\352\030\331,[!\013\353\315\300&\031F\203s%\307"
+    "l.\362\262\331C*\371\251\201s\202w\016\247Jb\306f\222\265\254\270i\372y\201"
+    "\252\012?\006\001\257\016\257\272\313 at u\242$B'\215\010p=\213\010\200N\022"
+    "y\262\321\346S?\305\273\254\026@\001T\024\357\024U!5\243\233dj\245F{,\247"
+    "\302\371\331\"y\347p\343\332]\004\202Se+1\252*t\323l\204\307\337\223\011\201"
+    "\002\267\216\224\270t\240\304\363\326\337\011\201\337!pj|\330N\010!p\256\242"
+    "<\333L\367\274]\021H\315\360\343QU\246\004\226w\222!\211r\357\343&wN\317p"
+    "\371d\201n\230\276\341\262\012\237{\011\257;\011\252B\316)@\364\300;\025\322"
+    "\271\202\367\235\000\277G\306\352\207\016\007\213\236\231\234CD03\372i\340"
+    "{?\005\021\346\012\036'\226\002\357\024xuy\361\350\303\232\204\336\311\262"
+    "g\241\224i\237W\020EDA\204\274*\013e\307\211\262gVB\357\352\231\303\017\200"
+    "7\262\274\274\314\372\372\272\007\316\000\207\376\363;\377\004\336\257\254"
+    "\254\244\377\000\003\326\376\177wQ\322\230\000\000\000%tEXtdate:create\000"
+    "2010-05-30T10:15:23+03:00\314\271\316\015\000\000\000%tEXtdate:modify\000"
+    "2010-05-30T10:15:19+03:00\227\033.\034\000\000\000\031tEXtSoftware\000Ado"
+    "be ImageReadyq\311e<\000\000\000\000IEND\256B`\202"
+};
+
 static const guint8 logjam_protected_png[] = {
     "\211PNG\015\012\032\012\000\000\000\015IHDR\000\000\000\021\000\000\000\021"
     "\010\004\000\000\000\221d\217q\000\000\000\002bKGD\000\377\207\217\314\277"
diff -up logjam-git/images/inline-images.rb.BAD logjam-git/images/inline-images.rb
--- logjam-git/images/inline-images.rb.BAD	2010-07-09 16:15:50.289268485 -0400
+++ logjam-git/images/inline-images.rb	2010-07-09 16:16:03.428314230 -0400
@@ -31,7 +31,7 @@ def process(filename)
 	puts
 end
 
-%w(logjam_ljuser.png logjam_ljcomm.png logjam_protected.png logjam_private.png).each { |img|
+%w(logjam_ljuser.png logjam_ljcomm.png logjam_twuser.png logjam_protected.png logjam_private.png).each { |img|
 	process(img)
 }
 
diff -up logjam-git/images/logjam_twuser.png.BAD logjam-git/images/logjam_twuser.png
Binary files logjam-git/images/logjam_twuser.png.BAD and logjam-git/images/logjam_twuser.png differ
diff -up logjam-git/images/Makefile.am.BAD logjam-git/images/Makefile.am
--- logjam-git/images/Makefile.am.BAD	2010-07-09 16:13:15.325381837 -0400
+++ logjam-git/images/Makefile.am	2010-07-09 16:14:06.793268553 -0400
@@ -4,6 +4,7 @@ pixmap_DATA = logjam_goat.png logjam_pen
 IMAGES = \
 	logjam_ljuser.png     \
 	logjam_ljcomm.png     \
+	logjam_twuser.png     \
 	logjam_private.png    \
 	logjam_protected.png  \
 	logjam_pencil.png     \
@@ -24,6 +25,7 @@ IMAGES = \
 LIST = \
 	logjam_ljuser        $(srcdir)/logjam_ljuser.png       \
 	logjam_ljcomm        $(srcdir)/logjam_ljcomm.png       \
+	logjam_twuser        $(srcdir)/logjam_twuser.png       \
 	logjam_private       $(srcdir)/logjam_private.png      \
 	logjam_protected     $(srcdir)/logjam_protected.png    \
 	logjam_rarrow        $(srcdir)/logjam_rarrow.png       \
diff -up logjam-git/src/icons.c.BAD logjam-git/src/icons.c
--- logjam-git/src/icons.c.BAD	2010-07-09 16:18:29.613284900 -0400
+++ logjam-git/src/icons.c	2010-07-09 16:18:39.852255562 -0400
@@ -79,6 +79,7 @@ icons_initialize(void) {
 	add(factory, logjam_pencil, "logjam-server");
 	add(factory, logjam_ljuser, "logjam-ljuser");
 	add(factory, logjam_ljcomm, "logjam-ljcomm");
+	add(factory, logjam_twuser, "logjam-twuser");
 	add(factory, logjam_protected, "logjam-protected");
 	add(factory, logjam_private, "logjam-private");
 	add(factory, logjam_blogger, "logjam-blogger");
diff -up logjam-git/src/link-journal.c.BAD logjam-git/src/link-journal.c
--- logjam-git/src/link-journal.c.BAD	2010-07-09 16:18:48.116383373 -0400
+++ logjam-git/src/link-journal.c	2010-07-09 16:21:10.882268949 -0400
@@ -35,6 +35,7 @@ make_usertype_omenu() {
 	menu = gtk_menu_new();
 	add_menu_item(GTK_MENU_SHELL(menu), "logjam-ljuser", _("User"));
 	add_menu_item(GTK_MENU_SHELL(menu), "logjam-ljcomm", _("Community"));
+	add_menu_item(GTK_MENU_SHELL(menu), "logjam-twuser", _("Twitter user"));
 
 	omenu = gtk_option_menu_new();
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
@@ -96,6 +97,11 @@ link_journal_dialog_run(GtkWindow *win, 
 	}
 	username = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	usernick = gtk_editable_get_chars(GTK_EDITABLE(entry_name), 0, -1);
+	/* Get user type:
+	 *  0 - LJ user
+	 *  1 - LJ community
+	 *  2 - Twitter user
+	 */
 	usertype = gtk_option_menu_get_history(GTK_OPTION_MENU(omenu));
 	gtk_widget_destroy(dlg);
 	if (username[0] == 0) {
@@ -109,6 +115,27 @@ link_journal_dialog_run(GtkWindow *win, 
 		gtk_text_buffer_get_iter_at_mark(buffer, &start,
 				gtk_text_buffer_get_insert(buffer));
 
+	if (usertype == 2 /* twitter user */) {
+		gchar *link;
+
+		xml_escape(&username);
+
+		if (usernick && *usernick) {
+			xml_escape(&usernick);
+			link = g_strdup_printf("@<a href='http://twitter.com/%s'>%s</a>",
+				username, usernick);
+			g_free(usernick);
+		} else
+			link = g_strdup_printf("@<a href='http://twitter.com/%s'>%s</a>",
+				username, username);
+
+		gtk_text_buffer_insert(buffer, &start, link, -1);
+
+		g_free(link);
+		g_free(username);
+		return;
+	}
+
 	if (usernick && *usernick) {
 		gchar *link;
 		JamAccount *acc = jam_doc_get_account(doc);
--- logjam-git/images/logjam_twuser.png.BAD	2010-07-09 16:21:49.333287408 -0400
+++ logjam-git/images/logjam_twuser.png	2010-07-09 16:21:30.161939396 -0400
@@ -0,0 +1,7 @@
+‰PNG
+
+   
IHDR         óÿa   bKGD þ þ þëÔ‚   	pHYs   H   H FÉk>   	vpAg       \Æ­Ã  GIDAT8ˍ“»nSA†¿™]ß1QL¸F„HJ¸< †Ž C ¤¥ Å©"(h #ïÀKÐ!(¸H\!q±MbÇÆö9»Cq;éXé×jµ£¾ùµ+Fƒµµµp8Îÿ­¯À£ÕÕÕ¶˜YáþÆè…ö–Z£€ˆÈ´T Û{<PP†¹òÛÆb᢮Ƞ»´±"jEêGÊtÓÈÓoÛ´†v<,ÛÿŒRNTâê
+Ôú!̘+:nœž¡\òÌWÜ<µŸDƒhFÀ–i æBÌ.çKž~„Í ãl%Gýp	€a4^¶tG‘86ð ÍÁí„qØʨù >_%Ž3¸v¬ÂÝWMšƒ”ajðg˜ð¥7b±êÙ,[!ëÍÀ&Fƒs%Çl.ò²ÙC*ù©s‚w§JbÆf’µ¬¸iúyª
+?¯¯ºË@u¢$B'p=‹€Ny²ÑæS?Å»¬@TïU!5£›dj¥F{,§ÂùÙ"yçpãÚ]‚Se+1ª*tÓl„Çß“	·Ž”¸t ÄóÖß	ß!pj|ØN!p®¢<ÛL÷¼]HÍðãQU¦–w’!‰rïã&wNÏpùdn˜¾á²
+Ÿ{	¯;	ªBÎ)@ôÀ;Ò¹‚÷ ¿GÆꇋž™œCD03úià{?æ
+'–ïxuyñèÚ„Þɲg¡”iŸWEDA„¼*elj²gVBïê™Ã€7²¼¼ÌúúºÎ ‡þó;ÿÞ¯¬¬¤ÿ ÖþwQÒ˜   %tEXtdate:create 2010-05-30T10:15:23+03:00̹Î
   %tEXtdate:modify 2010-05-30T10:15:19+03:00—.   tEXtSoftware Adobe ImageReadyqÉe<    IEND®B`‚
\ No newline at end of file


Index: logjam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/logjam/F-13/logjam.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- logjam.spec	18 Feb 2010 22:22:13 -0000	1.60
+++ logjam.spec	9 Jul 2010 20:37:16 -0000	1.61
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	38%{?dist}
+Release:	39%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -50,6 +50,17 @@ Patch16:	0001-Add-possibility-to-insert-
 Patch17:	0001-Add-automake-1.11-to-autogen.sh.patch
 # Fix implicit DSO linking issue
 Patch18:	logjam-4.5.3-fix-implicit-DSO.patch
+# From: http://github.com/andy-shev/LogJam/commit/b500b3995295f728a52cec2b7299130a828e2fcf
+Patch19:	logjam-4.5.3-fix-MusicSource.patch
+# From: http://github.com/andy-shev/LogJam/commit/390ae66557b05f9c6fec9d2d3ad361f83d42f36a
+Patch20:	logjam-4.5.3-bansheeclient.patch
+# From: http://github.com/andy-shev/LogJam/commit/1f14bfd1842ab633fe17303d8802c2e5de34f18d
+Patch21:	logjam-4.5.3-bz590291.patch
+# From: http://github.com/andy-shev/LogJam/commit/bdca85ee5a26f7eee83ec811b3f0761fbf2fda77
+# Also includes entry for Chromium (as opposed to Google Chrome)
+Patch22:	logjam-4.5.3-extendURLopener.patch
+# From: http://github.com/andy-shev/LogJam/commit/9bd2b18b15a7aa3ab0d0156e190d490892484c2f
+Patch23:	logjam-4.5.3-twuser.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -89,6 +100,11 @@ current music from XMMS.
 %patch16 -p1 -b .link-by-nickname
 %patch17 -p1 -b .automake111
 %patch18 -p1 -b .DSO
+%patch19 -p1 -b .fixMusicSource
+%patch20 -p1 -b .bansheeclient
+%patch21 -p1 -b .bz590291
+%patch22 -p1 -b .extendURLopener
+%patch23 -p1 -b .twuser
 
 %if 0%{fedora} >= 10
 libtoolize
@@ -128,6 +144,7 @@ desktop-file-install --vendor fedora    
 %defattr(-,root,root)
 %doc doc/README COPYING doc/TODO
 %{_bindir}/logjam
+%{_bindir}/logjam-banshee-client
 %{_mandir}/man1/logjam.1.gz
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/logjam*
@@ -141,6 +158,13 @@ desktop-file-install --vendor fedora    
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jul  9 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-39
+- clean up MusicSource list, add banshee detection (Andy Shevchenko) (bz 574254)
+- fix situation where outdated information is in logjam when 'last login' 
+  dialogue is off (Andy Shevchenko) (bz 590291)
+- update URL openers (Andy & spot) (bz 597705)
+- add ability to refer to twitter account (Andy) (bz 597708)
+
 * Thu Feb 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:4.5.3-38
 - dbus-glib-devel as BuildRequires in Fedora 13+
 



More information about the scm-commits mailing list