187 lines
6.2 KiB
Diff
187 lines
6.2 KiB
Diff
From 75d3053882dafbf1eb8ccc1df2085d32e453ac37 Mon Sep 17 00:00:00 2001
|
|
From: Dominique Leuenberger <dimstar@opensuse.org>
|
|
Date: Fri, 19 Apr 2013 22:02:11 +0000
|
|
Subject: Adapt to and require gnome-settings-daemon 3.7.3
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=698413
|
|
---
|
|
diff --git a/configure.in b/configure.in
|
|
index 16f7cc4..6b6c5a7 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -48,7 +48,7 @@ GDK_PIXBUF_REQUIRED=2.25.3
|
|
GTK_REQUIRED=3.0.0
|
|
LIBCANBERRA_REQUIRED=0
|
|
LIBNOTIFY_REQUIRED=0.7
|
|
-GSD_REQUIRED=3.5.91
|
|
+GSD_REQUIRED=3.7.3
|
|
|
|
# ************
|
|
# Typing Break
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 49ca76a..f8e09f2 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -73,7 +73,6 @@ gsd_plugin_LTLIBRARIES = \
|
|
$(NULL)
|
|
|
|
libtyping_break_la_SOURCES = \
|
|
- gsd-typing-break-plugin.h \
|
|
gsd-typing-break-plugin.c \
|
|
gsd-typing-break-manager.h \
|
|
gsd-typing-break-manager.c \
|
|
diff --git a/src/gsd-typing-break-plugin.c b/src/gsd-typing-break-plugin.c
|
|
index 8150331..2cee4f3 100644
|
|
--- a/src/gsd-typing-break-plugin.c
|
|
+++ b/src/gsd-typing-break-plugin.c
|
|
@@ -23,81 +23,8 @@
|
|
#include <glib/gi18n-lib.h>
|
|
#include <gmodule.h>
|
|
|
|
-#include "gsd-typing-break-plugin.h"
|
|
+#include <gnome-settings-daemon/gnome-settings-plugin.h>
|
|
#include "gsd-typing-break-manager.h"
|
|
|
|
-struct GsdTypingBreakPluginPrivate {
|
|
- GsdTypingBreakManager *manager;
|
|
-};
|
|
+GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreak, gsd_typing_break)
|
|
|
|
-#define GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginPrivate))
|
|
-
|
|
-GNOME_SETTINGS_PLUGIN_REGISTER (GsdTypingBreakPlugin, gsd_typing_break_plugin)
|
|
-
|
|
-static void
|
|
-gsd_typing_break_plugin_init (GsdTypingBreakPlugin *plugin)
|
|
-{
|
|
- plugin->priv = GSD_TYPING_BREAK_PLUGIN_GET_PRIVATE (plugin);
|
|
-
|
|
- g_debug ("GsdTypingBreakPlugin initializing");
|
|
-
|
|
- plugin->priv->manager = gsd_typing_break_manager_new ();
|
|
-}
|
|
-
|
|
-static void
|
|
-gsd_typing_break_plugin_finalize (GObject *object)
|
|
-{
|
|
- GsdTypingBreakPlugin *plugin;
|
|
-
|
|
- g_return_if_fail (object != NULL);
|
|
- g_return_if_fail (GSD_IS_TYPING_BREAK_PLUGIN (object));
|
|
-
|
|
- g_debug ("GsdTypingBreakPlugin finalizing");
|
|
-
|
|
- plugin = GSD_TYPING_BREAK_PLUGIN (object);
|
|
-
|
|
- g_return_if_fail (plugin->priv != NULL);
|
|
-
|
|
- if (plugin->priv->manager != NULL) {
|
|
- g_object_unref (plugin->priv->manager);
|
|
- }
|
|
-
|
|
- G_OBJECT_CLASS (gsd_typing_break_plugin_parent_class)->finalize (object);
|
|
-}
|
|
-
|
|
-static void
|
|
-impl_activate (GnomeSettingsPlugin *plugin)
|
|
-{
|
|
- gboolean res;
|
|
- GError *error;
|
|
-
|
|
- g_debug ("Activating typing_break plugin");
|
|
-
|
|
- error = NULL;
|
|
- res = gsd_typing_break_manager_start (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager, &error);
|
|
- if (! res) {
|
|
- g_warning ("Unable to start typing_break manager: %s", error->message);
|
|
- g_error_free (error);
|
|
- }
|
|
-}
|
|
-
|
|
-static void
|
|
-impl_deactivate (GnomeSettingsPlugin *plugin)
|
|
-{
|
|
- g_debug ("Deactivating typing_break plugin");
|
|
- gsd_typing_break_manager_stop (GSD_TYPING_BREAK_PLUGIN (plugin)->priv->manager);
|
|
-}
|
|
-
|
|
-static void
|
|
-gsd_typing_break_plugin_class_init (GsdTypingBreakPluginClass *klass)
|
|
-{
|
|
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
|
|
-
|
|
- object_class->finalize = gsd_typing_break_plugin_finalize;
|
|
-
|
|
- plugin_class->activate = impl_activate;
|
|
- plugin_class->deactivate = impl_deactivate;
|
|
-
|
|
- g_type_class_add_private (klass, sizeof (GsdTypingBreakPluginPrivate));
|
|
-}
|
|
diff --git a/src/gsd-typing-break-plugin.h b/src/gsd-typing-break-plugin.h
|
|
deleted file mode 100644
|
|
index 50bee59..0000000
|
|
--- a/src/gsd-typing-break-plugin.h
|
|
+++ /dev/null
|
|
@@ -1,59 +0,0 @@
|
|
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
|
|
- *
|
|
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
|
|
- *
|
|
- * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
- *
|
|
- */
|
|
-
|
|
-#ifndef __GSD_TYPING_BREAK_PLUGIN_H__
|
|
-#define __GSD_TYPING_BREAK_PLUGIN_H__
|
|
-
|
|
-#include <glib.h>
|
|
-#include <glib-object.h>
|
|
-#include <gmodule.h>
|
|
-
|
|
-#include <gnome-settings-daemon/gnome-settings-plugin.h>
|
|
-
|
|
-G_BEGIN_DECLS
|
|
-
|
|
-#define GSD_TYPE_TYPING_BREAK_PLUGIN (gsd_typing_break_plugin_get_type ())
|
|
-#define GSD_TYPING_BREAK_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPlugin))
|
|
-#define GSD_TYPING_BREAK_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginClass))
|
|
-#define GSD_IS_TYPING_BREAK_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_TYPING_BREAK_PLUGIN))
|
|
-#define GSD_IS_TYPING_BREAK_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_TYPING_BREAK_PLUGIN))
|
|
-#define GSD_TYPING_BREAK_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_TYPING_BREAK_PLUGIN, GsdTypingBreakPluginClass))
|
|
-
|
|
-typedef struct GsdTypingBreakPluginPrivate GsdTypingBreakPluginPrivate;
|
|
-
|
|
-typedef struct
|
|
-{
|
|
- GnomeSettingsPlugin parent;
|
|
- GsdTypingBreakPluginPrivate *priv;
|
|
-} GsdTypingBreakPlugin;
|
|
-
|
|
-typedef struct
|
|
-{
|
|
- GnomeSettingsPluginClass parent_class;
|
|
-} GsdTypingBreakPluginClass;
|
|
-
|
|
-GType gsd_typing_break_plugin_get_type (void) G_GNUC_CONST;
|
|
-
|
|
-/* All the plugins must implement this function */
|
|
-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
|
|
-
|
|
-G_END_DECLS
|
|
-
|
|
-#endif /* __GSD_TYPING_BREAK_PLUGIN_H__ */
|
|
--
|
|
cgit v0.9.2
|