Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[PATCH] Use Xfce 4.8 locations for plugin and desktop file.

[PATCH 2/3] Update FSFE address.
[PATCH 3/3] Fix author name.
All thanks to Christoph Wickert <cwickert@fedoraproject.org>
  • Loading branch information...
commit ea5147508b93c480a0581720f9b8ec053a1eabcc 1 parent 84ce35d
@matiasdelellis authored
View
2  AUTHORS
@@ -1 +1 @@
-John Doo <john@foo.org>
+Matias De lellis <mati86dl@gmail.com>
View
2  COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
View
2  COPYING.LIB
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
View
6 panel-plugin/Makefile.am
@@ -12,7 +12,7 @@ plugin_PROGRAMS = \
xfce4-soundmenu-plugin
plugindir = \
- $(libexecdir)/xfce4/panel-plugins
+ $(libdir)/xfce4/panel/plugins
xfce4_soundmenu_plugin_SOURCES = \
soundmenu-plugin.c \
@@ -69,7 +69,7 @@ endif
# Desktop file
#
desktopdir = \
- $(datadir)/xfce4/panel-plugins
+ $(datadir)/xfce4/panel/plugins
desktop_in_in_files = \
soundmenu.desktop.in.in
@@ -78,7 +78,7 @@ desktop_in_files = \
$(desktop_in_in_files:.desktop.in.in=.desktop.in)
%.desktop.in: %.desktop.in.in
- sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+ sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
desktop_DATA = \
$(desktop_in_files:.desktop.in=.desktop)
View
2  panel-plugin/soundmenu-dialogs.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
View
2  panel-plugin/soundmenu-dialogs.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#ifndef __SOUNDMENU_DIALOGS_H__
View
4 panel-plugin/soundmenu-lastfm.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
@@ -124,7 +124,7 @@ gboolean do_lastfm_now_playing (gpointer data)
soundmenu->metadata->artist,
soundmenu->metadata->length,
soundmenu->metadata->trackNumber,
- 0);
+ 0, NULL);
if (rv != 0) {
g_critical("Update current song on Last.fm failed");
View
2  panel-plugin/soundmenu-lastfm.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
View
2  panel-plugin/soundmenu-mpris2.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
View
2  panel-plugin/soundmenu-mpris2.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
Metadata *malloc_metadata();
View
2  panel-plugin/soundmenu-plugin.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
View
2  panel-plugin/soundmenu-plugin.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#ifdef HAVE_CONFIG_H
View
2  panel-plugin/soundmenu-related.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
View
2  panel-plugin/soundmenu-related.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
void soundmenu_search_lyric_dialog (GtkWidget *widget, SoundmenuPlugin *soundmenu);
View
2  panel-plugin/soundmenu-utils.c
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#include "soundmenu-plugin.h"
View
2  panel-plugin/soundmenu-utils.h
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
View
2  panel-plugin/soundmenu.desktop.in.in
@@ -4,5 +4,5 @@ Encoding=UTF-8
_Name=Sound menu Plugin
_Comment=Sound menu plugin for the Xfce panel
Icon=xfce4-soundmenu-plugin
-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-soundmenu-plugin
+X-XFCE-Exec=@libdir@/xfce4/panel/plugins/xfce4-soundmenu-plugin
X-XFCE-Unique=true
Please sign in to comment.
Something went wrong with that request. Please try again.