From 7ee5dc8e9b27cb485238adad62f104b3f1734d07 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 7 Apr 2010 10:30:36 +0100 Subject: Remove obsolete nautilus properties page --- Makefile.am | 2 +- configure.ac | 7 - nautilus/Makefile.am | 22 ---- nautilus/nautilus-sbmanager.c | 299 ------------------------------------------ nautilus/nautilus-sbmanager.h | 54 -------- nautilus/nautilus-sbmgr.c | 57 -------- 6 files changed, 1 insertion(+), 440 deletions(-) delete mode 100644 nautilus/Makefile.am delete mode 100644 nautilus/nautilus-sbmanager.c delete mode 100644 nautilus/nautilus-sbmanager.h delete mode 100644 nautilus/nautilus-sbmgr.c diff --git a/Makefile.am b/Makefile.am index 2a7ff6f..0e07060 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = data src po nautilus +SUBDIRS = data src po diff --git a/configure.ac b/configure.ac index 538582f..31abffe 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,6 @@ PKG_CHECK_MODULES(libclutter, clutter-1.0 >= 1.0.6) PKG_CHECK_MODULES(libcluttergtk, clutter-gtk-0.10 >= 0.10) PKG_CHECK_MODULES(libgtk, gtk+-2.0 >= 2.16) PKG_CHECK_MODULES(libgdkpixbuf, gdk-pixbuf-2.0 >= 2.16) -PKG_CHECK_MODULES(libnautilusextension, libnautilus-extension >= 2.21.2) # Checks for header files. AC_HEADER_STDC @@ -45,11 +44,6 @@ AC_CHECK_FUNCS([strcasecmp strdup strerror strndup]) AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Werror") AC_SUBST(GLOBAL_CFLAGS) -# Get nautilus extensions directory - -NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` -AC_SUBST(NAUTILUS_EXTENSION_DIR) - # i18n GETTEXT_PACKAGE=sbmanager @@ -65,6 +59,5 @@ Makefile data/Makefile src/Makefile po/Makefile.in -nautilus/Makefile ]) diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am deleted file mode 100644 index 3fac1d7..0000000 --- a/nautilus/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = \ - -DG_LOG_DOMAIN=\"Nautilus-SBManager\" \ - -DDATADIR=\"$(datadir)\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -Werror \ - $(libglib2_CFLAGS) \ - $(libgtk_CFLAGS) \ - $(libnautilusextension_CFLAGS) - -nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR) - -nautilus_extension_LTLIBRARIES=libnautilus-sbmanager.la - -libnautilus_sbmanager_la_SOURCES = \ - nautilus-sbmanager.h \ - nautilus-sbmanager.c \ - nautilus-sbmgr.c - -libnautilus_sbmanager_la_LDFLAGS = -module -avoid-version -libnautilus_sbmanager_la_LIBADD = $(libglib2_LIBS) $(libgtk_LIBS) $(libnautilusextension_LIBS) ../src/libsbmanager.la diff --git a/nautilus/nautilus-sbmanager.c b/nautilus/nautilus-sbmanager.c deleted file mode 100644 index 4b0ae2b..0000000 --- a/nautilus/nautilus-sbmanager.c +++ /dev/null @@ -1,299 +0,0 @@ -/* - * nautilus-sbmanager.c - * - * Copyright (C) 2010 Nikias Bassen - * - * 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 profile. - * - * 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 /* for GETTEXT_PACKAGE */ -#endif - -#include "nautilus-sbmanager.h" - -#include "../src/sbmgr.h" - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include /* for atoi */ -#include /* for strcmp */ -#include /* for chdir */ -#include - -static void nautilus_sbmanager_instance_init (NautilusSBManager *cvs); -static void nautilus_sbmanager_class_init (NautilusSBManagerClass *class); - -static GType sbmanager_type = 0; - -static gboolean loading = FALSE; - -static void launch_sbmanager (NautilusMenuItem *item) -{ - GdkScreen *screen; - GError *error = NULL; - gchar *argvp[4] = {(char*)"sbmanager", (char*)"-u", NULL, NULL}; - argvp[2] = g_object_get_data (G_OBJECT (item), "NautilusSBManager::uuid"); - - screen = g_object_get_data (G_OBJECT (item), "NautilusSBManager::screen"); - gdk_spawn_on_screen(screen, NULL, argvp, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error); - if (error) { - g_error_free(error); - } -} - -static void launch_sbmanager_callback (NautilusMenuItem *item, const char *uuid) -{ - launch_sbmanager (item); -} - -static NautilusMenuItem *launch_sbmanager_menu_item_new (const char *uuid, GdkScreen *screen) -{ - NautilusMenuItem *ret = NULL; - char *action_name = g_strdup_printf("NautilusSBManager::launch_sbmanager"); - const char *name = _("Manage _SpringBoard"); - const char *tooltip = _("Launch SBManager to manage the SpringBoard of this device"); - - ret = nautilus_menu_item_new (action_name, name, tooltip, "phone-apple-iphone"); - g_free (action_name); - - g_object_set_data (G_OBJECT (ret), - "NautilusSBManager::screen", - screen); - g_object_set_data (G_OBJECT (ret), - "NautilusSBManager::uuid", - (gpointer)g_strdup(uuid)); - g_signal_connect (ret, "activate", - G_CALLBACK (launch_sbmanager_callback), - NULL); - - return ret; -} - -GList * -nautilus_launch_sbmanager_get_file_items (NautilusMenuProvider *provider, - GtkWidget *window, - GList *files) -{ - gchar *uri; - gchar *uri_scheme; - GList *items; - NautilusMenuItem *item; - - if (g_list_length (files) != 1 - || ((nautilus_file_info_get_file_type (files->data) != G_FILE_TYPE_SHORTCUT) - && (nautilus_file_info_get_file_type (files->data) != G_FILE_TYPE_MOUNTABLE))) { - return NULL; - } - - items = NULL; - uri = nautilus_file_info_get_activation_uri (files->data); - uri_scheme = g_uri_parse_scheme (uri); - if ((strcmp(uri_scheme, "afc") == 0) && g_find_program_in_path("sbmanager")) { - gchar *uuid = g_strndup(uri + 6, 40); - item = launch_sbmanager_menu_item_new (uuid, gtk_widget_get_screen (window)); - g_free(uuid); - items = g_list_append (items, item); - } - g_free(uri_scheme); - g_free (uri); - - return items; -} - -static void -nautilus_launch_sbmanager_menu_provider_iface_init (NautilusMenuProviderIface *iface) -{ - iface->get_background_items = NULL; - iface->get_file_items = nautilus_launch_sbmanager_get_file_items; -} - -static void nautilus_sbmgr_load_finished(gboolean success) -{ - loading = FALSE; -} - -static gboolean nautilus_sbmgr_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) -{ - if (loading == FALSE) { - loading = TRUE; - sbmgr_load((const char*)g_object_get_data(G_OBJECT (widget), "NautilusSBManager::uuid"), NULL, nautilus_sbmgr_load_finished); - } - return TRUE; -} - -static gboolean nautilus_sbmgr_unrealize_cb(GtkWidget *widget, gpointer user_data) -{ - sbmgr_save((const char*)g_object_get_data(G_OBJECT (widget), "NautilusSBManager::uuid")); - sbmgr_finalize(); - - if (user_data) { - GtkWidget *sbmgr_widget = (GtkWidget*)user_data; - gtk_widget_destroy(sbmgr_widget); - } - - return TRUE; -} - -static GtkWidget *nautilus_sbmgr_new(const char *uuid) -{ - GtkWidget *sbmgr_widget = sbmgr_new(); - - if (!sbmgr_widget) { - return NULL; - } - - GtkWidget *sbmgr_container = gtk_alignment_new(0.5, 0.0, 0.0, 0.0); - gtk_alignment_set_padding(GTK_ALIGNMENT(sbmgr_container), 10, 10, 10, 10); - gtk_container_add(GTK_CONTAINER(sbmgr_container), sbmgr_widget); - gtk_widget_show_all(sbmgr_container); - - g_object_set_data (G_OBJECT (sbmgr_container), - "NautilusSBManager::uuid", - (gpointer)g_strdup(uuid)); - - g_signal_connect (G_OBJECT (sbmgr_container), - "expose-event", - G_CALLBACK(nautilus_sbmgr_expose_cb), - NULL); - - g_signal_connect (G_OBJECT (sbmgr_container), - "unrealize", - G_CALLBACK(nautilus_sbmgr_unrealize_cb), - sbmgr_widget); - - return sbmgr_container; -} - -static NautilusPropertyPage *sbmanager_property_page_new(NautilusPropertyPageProvider *provider, const char *uuid) -{ - NautilusPropertyPage *ret; - GtkWidget *page; - - page = nautilus_sbmgr_new(uuid); - - ret = nautilus_property_page_new ("sbmanager-page", gtk_label_new("SpringBoard"), page); - - return ret; -} - -GList *nautilus_sbmanager_property_page (NautilusPropertyPageProvider *provider, GList *files) -{ - GList *pages; - NautilusPropertyPage *page; - gchar *uri; - gchar *uri_scheme; - - if (g_list_length (files) != 1 - || ((nautilus_file_info_get_file_type (files->data) != G_FILE_TYPE_SHORTCUT) - && (nautilus_file_info_get_file_type (files->data) != G_FILE_TYPE_MOUNTABLE))) { - return NULL; - } - - pages = NULL; - uri = nautilus_file_info_get_activation_uri (files->data); - uri_scheme = g_uri_parse_scheme (uri); - if ((strcmp(uri_scheme, "afc") == 0) && g_find_program_in_path("sbmanager")) { - gchar *uuid = g_strndup(uri + 6, 40); - page = sbmanager_property_page_new(provider, uuid); - g_free(uuid); - pages = g_list_append(pages, page); - } - g_free(uri_scheme); - g_free (uri); - - return pages; -} - -static void -nautilus_sbmanager_property_page_provider_iface_init (NautilusPropertyPageProviderIface *iface) -{ - iface->get_pages = nautilus_sbmanager_property_page; -} - -static void -nautilus_sbmanager_instance_init (NautilusSBManager *cvs) -{ -} - -static void -nautilus_sbmanager_class_init (NautilusSBManagerClass *class) -{ -} - -static void -nautilus_sbmanager_class_finalize (NautilusSBManagerClass *class) -{ -} - -GType -nautilus_sbmanager_get_type (void) -{ - return sbmanager_type; -} - -void -nautilus_sbmanager_register_type (GTypeModule *module) -{ - static const GTypeInfo info = { - sizeof (NautilusSBManagerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) nautilus_sbmanager_class_init, - (GClassFinalizeFunc) nautilus_sbmanager_class_finalize, - NULL, - sizeof (NautilusSBManager), - 0, - (GInstanceInitFunc) nautilus_sbmanager_instance_init, - NULL - }; - - static const GInterfaceInfo menu_provider_iface_info = { - (GInterfaceInitFunc) nautilus_launch_sbmanager_menu_provider_iface_init, - NULL, - NULL - }; - - static const GInterfaceInfo property_page_iface_info = { - (GInterfaceInitFunc) nautilus_sbmanager_property_page_provider_iface_init, - NULL, - NULL - }; - - sbmanager_type = g_type_module_register_type (module, - G_TYPE_OBJECT, - "NautilusSBManager", - &info, 0); - - g_type_module_add_interface (module, - sbmanager_type, - NAUTILUS_TYPE_MENU_PROVIDER, - &menu_provider_iface_info); - - g_type_module_add_interface (module, - sbmanager_type, - NAUTILUS_TYPE_PROPERTY_PAGE_PROVIDER, - &property_page_iface_info); -} diff --git a/nautilus/nautilus-sbmanager.h b/nautilus/nautilus-sbmanager.h deleted file mode 100644 index d3179f8..0000000 --- a/nautilus/nautilus-sbmanager.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * nautilus-sbmanager.h - * - * Copyright (C) 2010 Nikias Bassen - * - * 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 profile. - * - * 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 NAUTILUS_SBMANAGER_H -#define NAUTILUS_SBMANAGER_H - -#include - -G_BEGIN_DECLS - -/* Declarations for the open terminal extension object. This object will be - * instantiated by nautilus. It implements the GInterfaces - * exported by libnautilus. */ - - -#define NAUTILUS_TYPE_SBMANAGER (nautilus_sbmanager_get_type ()) -#define NAUTILUS_SBMANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_SBMANAGER, NautilusSBManager)) -#define NAUTILUS_IS_SBMANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_SBMANAGER)) -typedef struct _NautilusSBManager NautilusSBManager; -typedef struct _NautilusSBManagerClass NautilusSBManagerClass; - -struct _NautilusSBManager { - GObject parent_slot; -}; - -struct _NautilusSBManagerClass { - GObjectClass parent_slot; -}; - -GType nautilus_sbmanager_get_type (void); -void nautilus_sbmanager_register_type (GTypeModule *module); - -G_END_DECLS - -#endif diff --git a/nautilus/nautilus-sbmgr.c b/nautilus/nautilus-sbmgr.c deleted file mode 100644 index 7bff0d0..0000000 --- a/nautilus/nautilus-sbmgr.c +++ /dev/null @@ -1,57 +0,0 @@ -/* - * nautilus-sbmgr.c - * - * Copyright (C) 2010 Nikias Bassen - * - * 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 profile. - * - * 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 -#endif - -#include "nautilus-sbmanager.h" - -#include - -static GType type_list[1]; - -void nautilus_module_initialize (GTypeModule *module); -void nautilus_module_shutdown (void); -void nautilus_module_list_types (const GType **types, int *num_types); - -void nautilus_module_initialize (GTypeModule *module) -{ - g_print ("Initializing nautilus-sbmanager extension\n"); - - nautilus_sbmanager_register_type (module); - type_list[0] = NAUTILUS_TYPE_SBMANAGER; - - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -} - -void nautilus_module_shutdown (void) -{ - g_print ("Shutting down nautilus-sbmanager extension\n"); -} - -void nautilus_module_list_types (const GType **types, int *num_types) -{ - *types = type_list; - *num_types = G_N_ELEMENTS (type_list); -} -- cgit v1.1-32-gdbae