evolution-rss r126 - in trunk: . src

From: lucilanga svn gnome org
To: svn-commits-list gnome org
Subject: evolution-rss r126 - in trunk: . src
Date: Thu, 24 Jan 2008 11:01:52 +0000 (GMT)
Author: lucilanga
Date: Thu Jan 24 11:01:52 2008
New Revision: 126
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=126&view=rev

Log:
spec updates for fedora

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/evolution-rss.spec.in
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Thu Jan 24 11:01:52 2008
@@ -31,6 +31,7 @@
 	* feed://
 	* fix authentication for proxy dialog
 	* fix 3270 lin
+	* fix move->rename
 	* use svn tag stuff when releasing
 	* fix when editing existing feeds
 	* fix ubuntu crashing when wrong entities

Modified: trunk/evolution-rss.spec.in
==============================================================================
--- trunk/evolution-rss.spec.in	(original)
+++ trunk/evolution-rss.spec.in	Thu Jan 24 11:01:52 2008
@@ -5,78 +5,85 @@
 Summary: Evolution RSS Reader
 Name:	 %{name}
 Version: %{version}
-Release: %{release}
-Group: unknown
-License: GPL
+Release: 1%{?dist}
+Group: Applications/Internet
+License: GPLv2+
 Source: http://mips.edu.ms/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://mips.edu.ms/evo/index.php/Evolution_RSS_Reader_Plugin
-Distribution: Freshmeat RPMs
-Packager: Lucian Langa <cooly mips edu ms>
-Provides: evolution-import-rss
 #Patch: evolution-rss-%{version}.patch
-#Prefix: /
-#BuildArch: noarch
-Requires: evolution, firefox-devel
-#Obsoletes: 
-BuildRequires: gettext, gettext-devel, gcc-c++, evolution-devel, evolution-data-server-devel, perl(XML::Parser)
+Requires: evolution
+Requires: firefox-devel
+Requires: dbus-glib
+
+Requires(post): GConf2
+Requires(preun): GConf2
+
+BuildRequires: gettext
+BuildRequires: gettext-devel
+BuildRequires: gcc-c++
+BuildRequires: evolution-devel
+BuildRequires: evolution-data-server-devel 
+BuildRequires: perl(XML::Parser)
+BuildRequires: dbus-glib-devel
 
 %description
 This is an evolution plugin which enables evolution to read rss feeds.
 
 %prep
-%setup -n evolution-rss-%{version}
+%setup -q -n evolution-rss-%{version}
 #%patch
 
 %build
-./configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --disable-webkit
-make
+./configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}"  --libdir=%{_libdir} --disable-webkit
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR="%{buildroot}"
+find %{buildroot} -name \*\.la -print | xargs rm -f
+%find_lang %{name}
 
 %clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
 rm -rf %{buildroot}
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-        %{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
+	%{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
 /sbin/ldconfig
 
 %preun
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
-        %{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
+	%{_sysconfdir}/gconf/schemas/evolution-rss.schemas >/dev/null
 
 %postun
 /sbin/ldconfig
 
-%files
-%defattr(-,root,root)
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %{_prefix}/bin/evolution-import-rss
 %{_sysconfdir}/gconf/schemas/evolution-rss.schemas
-%{_datadir}/locale/*/LC_MESSAGES/evolution-rss.mo
 %{_datadir}/evolution/*/errors/org-gnome-evolution-rss.error
 %{_datadir}/evolution/*/glade/rss-ui.glade
 %{_datadir}/evolution/*/images/rss.png
 %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.eplug
 %{_libdir}/evolution/*/plugins/org-gnome-evolution-rss.xml
 %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.so
-%{_libdir}/evolution/*/plugins/liborg-gnome-evolution-rss.la
 %{_libdir}/bonobo/servers/GNOME_Evolution_RSS_*.server
 %doc AUTHORS
 %doc COPYING
 %doc ChangeLog
 %doc FAQ
-%doc INSTALL
 %doc NEWS
 %doc README
 %doc TODO
 
 %changelog
+* Thu Jan 24 2008 Lucian Langa <lucilanga gnome org>
+- Fixed rpmlint warnings
+- Updated to Fedora Packaging Guidelines
 * Thu Nov 22 2007 Lucian Langa <lucilanga gnome org>
 - Added gconf schemas
 - Added evolution-import-rss

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Thu Jan 24 11:01:52 2008
@@ -180,6 +180,7 @@
 static void del_days_cb (GtkWidget *widget, add_feed *data);
 static void del_messages_cb (GtkWidget *widget, add_feed *data);
 void get_feed_age(gpointer key, gpointer value);
+void cancel_soup_sess(gpointer key, gpointer value, gpointer user_data);
 
 struct _MailComponentPrivate {
         GMutex *lock;
@@ -261,6 +262,8 @@
 	else
 		msg = g_strdup(emsg); 
 
+	goto out;
+
 #if (EVOLUTION_VERSION >= 22200)
 	if (key)
 	{ 
@@ -328,18 +331,19 @@
 {
 	static GdkPixbuf *progress_icon = NULL;
 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
-	progress_icon = e_icon_factory_get_icon ("stock_notes", E_ICON_SIZE_STATUS);
+	progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU);
 //	progress_icon = NULL;
 	char *mcp = g_strdup_printf("%p", mail_component_peek());
 	guint activity_id = 
 #if (EVOLUTION_VERSION >= 22200)
-		e_activity_handler_cancelable_operation_started(activity_handler, mcp,
-						progress_icon, message, FALSE,
+		e_activity_handler_cancelable_operation_started(activity_handler, "evolution-mail",
+						progress_icon, message, TRUE,
 						cancel_active_op, key);
 #else
 		e_activity_handler_operation_started(activity_handler, mcp,
 						progress_icon, message, FALSE);
 #endif
+	g_print("activity_id:%d\n", activity_id);
 
 	g_free(mcp);
 	return activity_id;
@@ -408,19 +412,22 @@
         	ActivityInfo *activity_info;
         	GList *p;
 		int order_number;
+		g_print("searchin id:%x\n", activity_id);
+		g_hash_table_foreach(rf->activity, print_hash, NULL);
 	
-        	p = lookup_activity (priv->activity_infos, activity_id, &order_number);
+/*        	p = lookup_activity (priv->activity_infos, activity_id, &order_number);
         	if (p == NULL) {
                 	g_warning ("EActivityHandler: unknown operation %d", activity_id);
                 	return;
         	}
 
         	activity_info = (ActivityInfo *) p->data;
-	g_print("--message:%s--\n", activity_info->information);
+	g_print("--message:%s--\n", activity_info->information);*/
 
 		e_activity_handler_operation_progressing(activity_handler,
 				activity_id,
-                                g_strdup(activity_info->information), 
+//                                g_strdup(activity_info->information), 
+				"1234",
                                 progress);
 	}
 }
@@ -428,14 +435,19 @@
 void
 taskbar_op_finish(gpointer key)
 {
+	g_print("op_finish\n");
 	EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
 	
 	if (rf->activity)
 	{
-		e_activity_handler_operation_finished(activity_handler, 
-			g_hash_table_lookup(rf->activity, key));
+		guint activity_key = g_hash_table_lookup(rf->activity, key);
+		g_print("key:%d\n", activity_key);
+		e_activity_handler_operation_finished(activity_handler, activity_key);
+//		g_hash_table_foreach(rf->activity, print_hash, NULL);
 		g_hash_table_remove(rf->activity, key);
+//		g_hash_table_foreach(rf->activity, print_hash, NULL);
 	}
+	g_print("kaput\n");
 }
 
 static void
@@ -485,7 +497,7 @@
 		}
 #endif
 //		taskbar_op_set_progress(data, (guint)fraction);
-		taskbar_op_set_progress(data, fraction/100);
+//		taskbar_op_set_progress(data, fraction/100);
         }
         break;
     case NET_STATUS_DONE:
@@ -2862,11 +2874,12 @@
 //	g_print("my cal %d w:%d h:%d\n", GTK_IS_WIDGET(data), width, height);
 		g_print("data:%p\n", data);
 		g_print("is_widget:%d\n", GTK_IS_WIDGET(widget));
-		g_print("is_data:%d\n", GTK_IS_WIDGET(data));
+		g_print("is_data:%p\n", data);
+		g_print("is_is_data:%d\n", GTK_IS_WIDGET(data));
 //		if (GTK_IS_MOZ_EMBED(data))
 //		{
 //			g_print("is mozembed\n");
-       		if (GTK_IS_WIDGET(data) && height > 50)
+       		if (data && GTK_IS_WIDGET(data) && height > 50)
 		{
 			gtk_widget_set_size_request((GtkWidget *)data, width, height);
 // apparently resizing gtkmozembed widget won't redraw if using xulrunner
@@ -3692,8 +3705,9 @@
 out:	
 	if (user_data)
 	{
-		taskbar_op_finish(user_data);
+//		taskbar_op_finish(user_data);
 		g_free(user_data);
+	g_print("kaput\n");
 	}
 	return;
 }
@@ -3708,10 +3722,10 @@
 	RDF *r;
 //	rf->cfeed = key;
 	
-	if (!rf->activity)
-		rf->activity = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
-	if (!rf->error_hash)
-		rf->error_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+//	if (!rf->activity)
+//		rf->activity = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+//	if (!rf->error_hash)
+//		rf->error_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
 	// check if we're enabled and no cancelation signal pending
 	// and no imports pending
@@ -3730,14 +3744,16 @@
         	else
                         tmsg = g_strdup_printf("Fetching %s: %s", 
                         type, key);
-
+/*
 #if (EVOLUTION_VERSION >= 22200)
 		guint activity_id = taskbar_op_new(tmsg, key);
 #else
 		guint activity_id = taskbar_op_new(tmsg);
 #endif
+*/
 		g_free(tmsg);
-		g_hash_table_insert(rf->activity, key, activity_id);
+		g_print("insert key:%s\n", key);
+///		g_hash_table_insert(rf->activity, key, (gpointer)activity_id);
 
 		net_get_unblocking(
 				g_hash_table_lookup(rf->hr, lookup_key(key)),
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]