Updating branch refs/heads/master to b1a552953c2bbeea6416c22a5a6fd66837874734 (commit) from 1dff422e325ad26d68b70366f153cbe283c8190e (commit)
commit b1a552953c2bbeea6416c22a5a6fd66837874734 Author: Sean Davis <smd.seanda...@gmail.com> Date: Fri Jul 13 14:00:28 2012 -0400 Added deletions to commit. plugins/window-title/Makefile.am | 42 -------- plugins/window-title/window-title-plugin.c | 47 -------- plugins/window-title/window-title-provider.c | 147 -------------------------- plugins/window-title/window-title-provider.h | 44 -------- plugins/window-title/window-title.desktop.in | 6 - 5 files changed, 0 insertions(+), 286 deletions(-) diff --git a/plugins/window-title/Makefile.am b/plugins/window-title/Makefile.am deleted file mode 100644 index 888a2db..0000000 --- a/plugins/window-title/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -INCLUDES = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"window_title\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" - -pluginsdir = \ - $(libdir)/parole-$(PAROLE_VERSION_API) - -plugins_LTLIBRARIES = \ - window-title.la - -window_title_la_SOURCES = \ - window-title-plugin.c \ - window-title-provider.c \ - window-title-provider.h - -window_title_la_CFLAGS = \ - $(PLATFORM_CFLAGS) \ - $(GTK_CFLAGS) \ - $(LIBXFCE4UTIL_CFLAGS) - -window_title_la_LDFLAGS = \ - -avoid-version \ - -export-dynamic \ - -module \ - $(PLATFORM_LDFLAGS) - -# -# .desktop file -# -desktop_in_files = window-title.desktop.in -desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API) -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@INTLTOOL_DESKTOP_RULE@ - -EXTRA_DIST = \ - $(desktop_in_files) - -DISTCLEANFILES = \ - $(desktop_DATA) \ No newline at end of file diff --git a/plugins/window-title/window-title-plugin.c b/plugins/window-title/window-title-plugin.c deleted file mode 100644 index 465e605..0000000 --- a/plugins/window-title/window-title-plugin.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * * Copyright (C) 2009-2011 Ali <al...@xfce.org> - * - * Licensed under the GNU General Public License Version 2 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <libxfce4util/libxfce4util.h> - -#include "window-title-provider.h" - -G_MODULE_EXPORT GType parole_plugin_initialize (ParoleProviderPlugin *plugin); - -G_MODULE_EXPORT void parole_plugin_shutdown (void); - -G_MODULE_EXPORT GType -parole_plugin_initialize (ParoleProviderPlugin *plugin) -{ - xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); - - window_title_provider_register_type (plugin); - - return WINDOW_TYPE_TITLE_PROVIDER; -} - -G_MODULE_EXPORT void -parole_plugin_shutdown (void) -{ - -} diff --git a/plugins/window-title/window-title-provider.c b/plugins/window-title/window-title-provider.c deleted file mode 100644 index 85e2364..0000000 --- a/plugins/window-title/window-title-provider.c +++ /dev/null @@ -1,147 +0,0 @@ -/* - * * Copyright (C) 2009-2011 Ali <al...@xfce.org> - * - * Licensed under the GNU General Public License Version 2 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <libxfce4util/libxfce4util.h> - -#include "window-title-provider.h" - -static void window_title_provider_iface_init (ParoleProviderPluginIface *iface); -static void window_title_provider_finalize (GObject *object); - - -struct _WindowTitleProviderClass -{ - GObjectClass parent_class; -}; - -struct _WindowTitleProvider -{ - GObject parent; - - ParoleProviderPlayer *player; - GtkWidget *window; -}; - - -PAROLE_DEFINE_TYPE_WITH_CODE (WindowTitleProvider, - window_title_provider, - G_TYPE_OBJECT, - PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, - window_title_provider_iface_init)); - - - -static void -window_title_provider_set_default_window_title (GtkWidget *window) -{ - gtk_window_set_title (GTK_WINDOW (window), _("Parole Media Player")); -} - -static void -window_title_provider_set_stream_title (GtkWidget *window, const ParoleStream *stream) -{ - gchar *title = NULL; - - g_object_get (G_OBJECT (stream), - "title", &title, - NULL); - - if ( title ) - { - gtk_window_set_title (GTK_WINDOW (window), title); - g_free (title); - } -} - -static void -window_title_provider_state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, - ParoleState state, WindowTitleProvider *provider) -{ - if ( state < PAROLE_STATE_PAUSED ) - window_title_provider_set_default_window_title (provider->window); - else - window_title_provider_set_stream_title (provider->window, stream); -} - -static void -window_title_provider_tag_message_cb (ParoleProviderPlayer *player, const ParoleStream *stream, WindowTitleProvider *provider) -{ - window_title_provider_set_stream_title (provider->window, stream); -} - -static gboolean window_title_provider_is_configurable (ParoleProviderPlugin *plugin) -{ - return FALSE; -} - -static void -window_title_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *player) -{ - WindowTitleProvider *provider; - provider = WINDOW_TITLE_PROVIDER (plugin); - - provider->player = player; - - provider->window = parole_provider_player_get_main_window (player); - - g_signal_connect (player, "state-changed", - G_CALLBACK (window_title_provider_state_changed_cb), provider); - - g_signal_connect (player, "tag-message", - G_CALLBACK (window_title_provider_tag_message_cb), provider); -} - -static void -window_title_provider_iface_init (ParoleProviderPluginIface *iface) -{ - iface->get_is_configurable = window_title_provider_is_configurable; - iface->set_player = window_title_provider_set_player; -} - -static void window_title_provider_class_init (WindowTitleProviderClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->finalize = window_title_provider_finalize; -} - -static void window_title_provider_init (WindowTitleProvider *provider) -{ - provider->player = NULL; - g_debug ("Init"); -} - -static void window_title_provider_finalize (GObject *object) -{ - WindowTitleProvider *provider; - - provider = WINDOW_TITLE_PROVIDER (object); - - g_debug ("Finalized"); - - if ( provider->window && GTK_IS_WINDOW (provider->window) ) - window_title_provider_set_default_window_title (provider->window); - - G_OBJECT_CLASS (window_title_provider_parent_class)->finalize (object); -} diff --git a/plugins/window-title/window-title-provider.h b/plugins/window-title/window-title-provider.h deleted file mode 100644 index f88152b..0000000 --- a/plugins/window-title/window-title-provider.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * * Copyright (C) 2009-2011 Ali <al...@xfce.org> - * - * Licensed under the GNU General Public License Version 2 - * - * 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 2 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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef WINDOW_TITLE_PROVIDER_H_ -#define WINDOW_TITLE_PROVIDER_H_ - -#include <parole/parole.h> - -G_BEGIN_DECLS - -typedef struct _WindowTitleProviderClass WindowTitleProviderClass; -typedef struct _WindowTitleProvider WindowTitleProvider; - -#define WINDOW_TYPE_TITLE_PROVIDER (window_title_provider_get_type ()) -#define WINDOW_TITLE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), WINDOW_TYPE_TITLE_PROVIDER, WindowTitleProvider)) -#define WINDOW_TITLE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), WINDOW_TYPE_TITLE_PROVIDER, WindowTitleProviderClass)) -#define WINDOW_IS_TITLE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WINDOW_TYPE_TITLE_PROVIDER)) -#define WINDOW_IS_TITLE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), WINDOW_TYPE_TITLE_PROVIDER)) -#define WINDOW_TITLE_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), WINDOW_TYPE_TITLE_PROVIDER, WindowTitleProviderClass)) - -GType window_title_provider_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL; - -void window_title_provider_register_type (ParoleProviderPlugin *plugin); - -G_END_DECLS - -#endif /*WINDOW_TITLE_PROVIDER_H_*/ diff --git a/plugins/window-title/window-title.desktop.in b/plugins/window-title/window-title.desktop.in deleted file mode 100644 index 0d251bd..0000000 --- a/plugins/window-title/window-title.desktop.in +++ /dev/null @@ -1,6 +0,0 @@ -[Parole Plugin] -Module=window-title -_Name=Window Title -_Description=Set the main window name to the current playing media name. -Authors=Sarah Hijazi -Website=http://goodies.xfce.org/projects/applications/parole _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits