Attachment #99871 for bug #139057

Lines 6-12 Link Here

(-)Makefile (+1 lines)
6	#	6	#
7		7
8	PORTNAME= conky	8	PORTNAME= conky
9	PORTVERSION= 1.7.2	9	PORTVERSION= 1.7.2
		10	PORTREVISION= 1
10	CATEGORIES= sysutils	11	CATEGORIES= sysutils
11	MASTER_SITES= SF	12	MASTER_SITES= SF
12		13




--- src/bmpx.c.orig	2009-09-23 22:02:33.000000000 +0300
+++ src/bmpx.c	2009-09-23 22:03:54.000000000 +0300
@@ -41,7 +41,7 @@
 static int connected = 0;
 static char *unknown = "unknown";
 
-void fail(GError *error);
+void fail(GError *error, struct information *);
 
 void update_bmpx()
 {
@@ -57,15 +57,15 @@
 		bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 		if (bus == NULL) {
 			ERR("BMPx error 1: %s\n", error->message);
-			fail(error);
+			fail(error, current_info);
 			return;
 		}
 
 		remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
-				BMP_DBUS_PATH, BMP_DBUS_INTERFACE);
+				BMP_DBUS_PATH__BMP, BMP_DBUS_INTERFACE__BMP);
 		if (!remote_object) {
 			ERR("BMPx error 2: %s\n", error->message);
-			fail(error);
+			fail(error, current_info);
 			return;
 		}
 
@@ -77,7 +77,7 @@
 					G_TYPE_INVALID, G_TYPE_INT, &current_track, G_TYPE_INVALID)) {
 		} else {
 			ERR("BMPx error 3: %s\n", error->message);
-			fail(error);
+			fail(error, current_info);
 			return;
 		}
 
@@ -111,17 +111,17 @@
 				g_value_get_string(g_hash_table_lookup(metadata, "location"));
 		} else {
 			ERR("BMPx error 4: %s\n", error->message);
-			fail(error);
+			fail(error, current_info);
 			return;
 		}
 
 		g_hash_table_destroy(metadata);
 	} else {
-		fail(error);
+		fail(error, current_info);
 	}
 }
 
-void fail(GError *error)
+void fail(GError *error, struct information *current_info)
 {
 	if (error) {
 		g_error_free(error);




--- src/bmpx.h.orig	2009-09-23 22:04:47.000000000 +0300
+++ src/bmpx.h	2009-09-23 22:02:05.000000000 +0300
@@ -0,0 +1,39 @@
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
+ *
+ * Please see COPYING for details
+ *
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ *	(see AUTHORS)
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef BMPX_H_
+#define BMPX_H_
+
+void update_bmpx(void);
+struct bmpx_s {
+	char *title;
+	char *artist;
+	char *album;
+	char *uri;
+	int bitrate;
+	int track;
+};
+
+#endif /*BMPX_H_*/

Return to bug 139057

Line 0 Link Here

(-)files/patch-src-bmpx.c (+60 lines)
	1	--- src/bmpx.c.orig 2009-09-23 22:02:33.000000000 +0300
	2	+++ src/bmpx.c 2009-09-23 22:03:54.000000000 +0300
	3	@@ -41,7 +41,7 @@
	4	static int connected = 0;
	5	static char *unknown = "unknown";
	6
	7	-void fail(GError *error);
	8	+void fail(GError error, struct information );
	9
	10	void update_bmpx()
	11	{
	12	@@ -57,15 +57,15 @@
	13	bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
	14	if (bus == NULL) {
	15	ERR("BMPx error 1: %s\n", error->message);
	16	- fail(error);
	17	+ fail(error, current_info);
	18	return;
	19	}
	20
	21	remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
	22	- BMP_DBUS_PATH, BMP_DBUS_INTERFACE);
	23	+ BMP_DBUS_PATH__BMP, BMP_DBUS_INTERFACE__BMP);
	24	if (!remote_object) {
	25	ERR("BMPx error 2: %s\n", error->message);
	26	- fail(error);
	27	+ fail(error, current_info);
	28	return;
	29	}
	30
	31	@@ -77,7 +77,7 @@
	32	G_TYPE_INVALID, G_TYPE_INT, &current_track, G_TYPE_INVALID)) {
	33	} else {
	34	ERR("BMPx error 3: %s\n", error->message);
	35	- fail(error);
	36	+ fail(error, current_info);
	37	return;
	38	}
	39
	40	@@ -111,17 +111,17 @@
	41	g_value_get_string(g_hash_table_lookup(metadata, "location"));
	42	} else {
	43	ERR("BMPx error 4: %s\n", error->message);
	44	- fail(error);
	45	+ fail(error, current_info);
	46	return;
	47	}
	48
	49	g_hash_table_destroy(metadata);
	50	} else {
	51	- fail(error);
	52	+ fail(error, current_info);
	53	}
	54	}
	55
	56	-void fail(GError *error)
	57	+void fail(GError error, struct information current_info)
	58	{
	59	if (error) {
	60	g_error_free(error);

Line 0 Link Here

(-)files/patch-src-bmpx.h (+42 lines)
	1	--- src/bmpx.h.orig 2009-09-23 22:04:47.000000000 +0300
	2	+++ src/bmpx.h 2009-09-23 22:02:05.000000000 +0300
	3	@@ -0,0 +1,39 @@
	4	+/* -- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t --
	5	+ * vim: ts=4 sw=4 noet ai cindent syntax=c
	6	+ *
	7	+ * Conky, a system monitor, based on torsmo
	8	+ *
	9	+ * Please see COPYING for details
	10	+ *
	11	+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
	12	+ * (see AUTHORS)
	13	+ * All rights reserved.
	14	+ *
	15	+ * This program is free software: you can redistribute it and/or modify
	16	+ * it under the terms of the GNU General Public License as published by
	17	+ * the Free Software Foundation, either version 3 of the License, or
	18	+ * (at your option) any later version.
	19	+ *
	20	+ * This program is distributed in the hope that it will be useful,
	21	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	22	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	23	+ * GNU General Public License for more details.
	24	+ * You should have received a copy of the GNU General Public License
	25	+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
	26	+ *
	27	+ */
	28	+
	29	+#ifndef BMPX_H_
	30	+#define BMPX_H_
	31	+
	32	+void update_bmpx(void);
	33	+struct bmpx_s {
	34	+ char *title;
	35	+ char *artist;
	36	+ char *album;
	37	+ char *uri;
	38	+ int bitrate;
	39	+ int track;
	40	+};
	41	+
	42	+#endif /BMPX_H_/