diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-15 19:25:01 -0300 |
| commit | ecec4d4d3ca64d7929f1f63857e82268798e066b (patch) | |
| tree | dfc5421b1f5460a449502c66d612e1132ec5d49f /extra/xfce4-timer-plugin | |
| parent | eddd84528e605047a994ee8d652ba99686a412fc (diff) | |
| parent | 1ffabe284d9f5a4ac055941d9817af71be1e5b54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/binutils-avr/PKGBUILD
community/freecol/PKGBUILD
community/gcc-avr/PKGBUILD
community/lightspark/PKGBUILD
community/lorcon-old-svn/PKGBUILD
community/mdf2iso/PKGBUILD
community/pylorcon/PKGBUILD
community/qbittorrent/PKGBUILD
community/remmina-plugins/PKGBUILD
community/systemd/PKGBUILD
community/texmaker/PKGBUILD
extra/pyqt/PKGBUILD
extra/uim/PKGBUILD
extra/wesnoth/PKGBUILD
libre/kdenetwork-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
multilib-testing/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/libtool-multilib/libtool.install
testing/glibc/PKGBUILD
testing/shadow/PKGBUILD
testing/xf86-video-savage/PKGBUILD
Diffstat (limited to 'extra/xfce4-timer-plugin')
| -rw-r--r-- | extra/xfce4-timer-plugin/panel48.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/extra/xfce4-timer-plugin/panel48.patch b/extra/xfce4-timer-plugin/panel48.patch deleted file mode 100644 index 056023712..000000000 --- a/extra/xfce4-timer-plugin/panel48.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Thu, 27 Jan 2011 21:18:45 +0000 -Subject: Fix segfault when creating plugin in 4.8 panel. - -Used invalid function type to construct the plugin. ---- -diff --git a/src/xfcetimer.c b/src/xfcetimer.c -index c27d37a..de7bd2b 100644 ---- a/src/xfcetimer.c -+++ b/src/xfcetimer.c -@@ -42,7 +42,7 @@ - - #include "xfcetimer.h" - --static gboolean create_plugin_control (XfcePanelPlugin *plugin); -+static void create_plugin_control (XfcePanelPlugin *plugin); - XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control); - - void make_menu(plugin_data *pd); -@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) { - * - * Returns %TRUE on success, %FALSE on failure. - **/ --static gboolean -+static void - create_plugin_control (XfcePanelPlugin *plugin) - { - -@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin) - xfce_panel_plugin_menu_show_configure (plugin); - g_signal_connect (plugin, "configure-plugin", - G_CALLBACK (plugin_create_options), pd); -- return(TRUE); - } - - --- -cgit v0.8.3.4 |