packages: xfce4-linelight-plugin/xfce4-linelight-plugin.spec, xfce4-linelig...

[baggins]

Author: baggins                      Date: Thu May 17 21:16:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with xfce 4.10, patch from gentoo

---- Files affected:
packages/xfce4-linelight-plugin:
   xfce4-linelight-plugin.spec (1.7 -> 1.8) , xfce4-linelight-plugin-xfcerc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec
diff -u packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec:1.7 packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec:1.8
--- packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec:1.7	Thu May 17 21:42:55 2012
+++ packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec	Thu May 17 23:16:03 2012
@@ -11,18 +11,19 @@
 Patch0:		includes.patch
 Patch1:		%{name}-gio.patch
 Patch2:		%{name}-ui.patch
+Patch3:		%{name}-xfcerc.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-linelight-plugin
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	glib2-devel >= 1:2.18.0
 BuildRequires:	libtool
-BuildRequires:	libxfce4ui-devel >= 4.8.0
+BuildRequires:	libxfce4ui-devel >= 4.10.0
 BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	xfce4-dev-tools >= 4.4.0
-BuildRequires:	xfce4-panel-devel >= 4.4.0
+BuildRequires:	xfce4-dev-tools >= 4.10.0
+BuildRequires:	xfce4-panel-devel >= 4.10.0
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
-Requires:	xfce4-panel >= 4.4.0
+Requires:	xfce4-panel >= 4.10.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,6 +37,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p0
 
 %build
 %{__libtoolize}
@@ -76,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/05/17 21:16:03  baggins
+- fix building with xfce 4.10, patch from gentoo
+
 Revision 1.7  2012/05/17 19:42:55  baggins
 - release 6
 

================================================================
Index: packages/xfce4-linelight-plugin/xfce4-linelight-plugin-xfcerc.patch
diff -u /dev/null packages/xfce4-linelight-plugin/xfce4-linelight-plugin-xfcerc.patch:1.1
--- /dev/null	Thu May 17 23:16:08 2012
+++ packages/xfce4-linelight-plugin/xfce4-linelight-plugin-xfcerc.patch	Thu May 17 23:16:03 2012
@@ -0,0 +1,61 @@
+http://bugs.gentoo.org/411949
+http://bugs.ganymede.ch/
+http://lionel.lefolgoc.net/misc/01_port-to-xfcerc.patch
+
+--- panel-plugin/linelight.c
++++ panel-plugin/linelight.c
+@@ -207,7 +207,7 @@ void linelight_add_list_entry(LineLightD
+     remove_newline(entry);
+ 
+     GtkTreeIter iter;
+-    char *icon;
++    const gchar *icon = NULL;
+     GdkPixbuf *pixbuf;
+ 
+     gtk_list_store_insert(data->list, &iter, data->listPointer[sec]);
+@@ -218,13 +218,15 @@ void linelight_add_list_entry(LineLightD
+     //icon
+     if (g_file_query_exists (file, NULL) && sec == BIN_SECTION )
+     {
+-        XfceDesktopEntry* app = xfce_desktop_entry_new(entry,categories,3);
++        XfceRc* app = xfce_rc_simple_open(entry, TRUE);
+ 
+-        if (app != NULL && xfce_desktop_entry_get_string(app, "Icon", TRUE, &icon)  && NULL != (pixbuf= load_icon(icon)))
++        if (app != NULL)
+         {
+-            gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
+-            g_object_unref(app);
+-            free(icon);
++            xfce_rc_set_group(app, G_KEY_FILE_DESKTOP_GROUP);
++            icon = xfce_rc_read_entry(app, G_KEY_FILE_DESKTOP_KEY_ICON, NULL);
++            if (icon != NULL && NULL != (pixbuf= load_icon(icon)))
++                gtk_list_store_set(data->list, &iter, ICON_COL, pixbuf, -1);
++            xfce_rc_close(app);
+         }
+     }
+     else if (file != NULL)
+--- panel-plugin/main.c
++++ panel-plugin/main.c
+@@ -155,14 +155,15 @@ static void cell_renderer(GtkTreeViewCol
+     }
+     else if (strstr(name,".desktop") != NULL) //Application names based on .desktop files
+     {
+-        XfceDesktopEntry *application = xfce_desktop_entry_new(path,categories,3);
+-        if (XFCE_IS_DESKTOP_ENTRY(application))
++        XfceRc *application = xfce_rc_simple_open(path, TRUE);
++        if (application != NULL)
+         {
+-            char* app_name;
+-            xfce_desktop_entry_get_string(application, "Name", TRUE, &app_name);
+-            g_object_unref(application);
+-            g_object_set(cell,"text", app_name,NULL);
+-            free(app_name);
++            const gchar* app_name = NULL;
++            xfce_rc_set_group(application, G_KEY_FILE_DESKTOP_GROUP);
++            app_name = xfce_rc_read_entry(application, G_KEY_FILE_DESKTOP_KEY_NAME, NULL);
++            if (app_name != NULL)
++                g_object_set(cell,"text", app_name, NULL);
++            xfce_rc_close(application);
+         }
+     }
+     else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xfce4-linelight-plugin/xfce4-linelight-plugin.spec?r1=1.7&r2=1.8