[gnome-control-center] background: Remove uses of libsocialweb and BgFlickrSource
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] background: Remove uses of libsocialweb and BgFlickrSource
- Date: Thu, 13 Feb 2014 13:03:19 +0000 (UTC)
commit 6c05a7d176bd0c98aef10e6bbc7b9d817902b70e
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Feb 11 17:12:23 2014 +0100
background: Remove uses of libsocialweb and BgFlickrSource
BgFlickrSource will be merged with BgPicturesSource and rewritten using
Grilo at the same time.
https://bugzilla.gnome.org/show_bug.cgi?id=707569
configure.ac | 23 ----
panels/background/Makefile.am | 6 -
panels/background/bg-flickr-source.c | 153 ----------------------
panels/background/bg-flickr-source.h | 74 -----------
panels/background/cc-background-chooser-dialog.c | 25 ----
5 files changed, 0 insertions(+), 281 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7a07dd8..bcac063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,24 +327,6 @@ AC_SUBST(PANEL_CFLAGS)
PANEL_LIBS=""
AC_SUBST(PANEL_LIBS)
-dnl ==============================================
-dnl libsocialweb
-dnl ==============================================
-
-AC_MSG_CHECKING([Enable libsocialweb support])
-AC_ARG_WITH([libsocialweb],
- AS_HELP_STRING([--with-libsocialweb],
- [enable libsocialweb support]),,
- [with_libsocialweb=no])
-AC_MSG_RESULT([$with_libsocialweb])
-
-if test "x$with_libsocialweb" == "xyes"; then
- PKG_CHECK_MODULES(SOCIALWEB, libsocialweb-client)
- AC_DEFINE(HAVE_LIBSOCIALWEB, 1, [Defined if libsocialweb is available])
-fi
-AM_CONDITIONAL(WITH_LIBSOCIALWEB, test "x$with_libsocialweb" = "xyes")
-
-
dnl =======================================
dnl Update Mime Database
dnl =======================================
@@ -557,11 +539,6 @@ if test "x$have_cheese" = "xyes"; then
else
AC_MSG_NOTICE([ Users panel webcam support disabled])
fi
-if test "x$with_libsocialweb" = "xyes"; then
- AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
-else
- AC_MSG_NOTICE([ Background panel Flickr support disabled])
-fi
if test "x$have_wacom" = "xyes"; then
AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
else
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
index 98efafe..9b3668c 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -48,12 +48,6 @@ libbackground_la_SOURCES = \
libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
-if WITH_LIBSOCIALWEB
-libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
-INCLUDES += $(SOCIALWEB_CFLAGS)
-libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS)
-endif
-
noinst_PROGRAMS = test-chooser-dialog
test_chooser_dialog_SOURCES = test-chooser-dialog.c
test_chooser_dialog_LDADD = libbackground-chooser.la $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
diff --git a/panels/background/cc-background-chooser-dialog.c
b/panels/background/cc-background-chooser-dialog.c
index b37d337..570e5da 100644
--- a/panels/background/cc-background-chooser-dialog.c
+++ b/panels/background/cc-background-chooser-dialog.c
@@ -26,9 +26,6 @@
#include "bg-wallpapers-source.h"
#include "bg-pictures-source.h"
#include "bg-colors-source.h"
-#ifdef HAVE_LIBSOCIALWEB
-#include "bg-flickr-source.h"
-#endif
#include "cc-background-item.h"
#include "cc-background-xml.h"
@@ -45,9 +42,6 @@ enum
SOURCE_WALLPAPERS,
SOURCE_PICTURES,
SOURCE_COLORS,
-#ifdef HAVE_LIBSOCIALWEB
- SOURCE_FLICKR
-#endif
};
struct _CcBackgroundChooserDialogPrivate
@@ -60,9 +54,6 @@ struct _CcBackgroundChooserDialogPrivate
BgWallpapersSource *wallpapers_source;
BgPicturesSource *pictures_source;
BgColorsSource *colors_source;
-#ifdef HAVE_LIBSOCIALWEB
- BgFlickrSource *flickr_source;
-#endif
GnomeDesktopThumbnailFactory *thumb_factory;
@@ -119,9 +110,6 @@ cc_background_chooser_dialog_dispose (GObject *object)
g_clear_object (&priv->pictures_source);
g_clear_object (&priv->colors_source);
g_clear_object (&priv->wallpapers_source);
-#ifdef HAVE_LIBSOCIALWEB
- g_clear_object (&priv->flickr_source);
-#endif
g_clear_object (&priv->thumb_factory);
G_OBJECT_CLASS (cc_background_chooser_dialog_parent_class)->dispose (object);
@@ -278,9 +266,6 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
priv->wallpapers_source = bg_wallpapers_source_new ();
priv->pictures_source = bg_pictures_source_new ();
priv->colors_source = bg_colors_source_new ();
-#ifdef HAVE_LIBSOCIALWEB
- priv->flickr_source = bg_flickr_source_new ();
-#endif
priv->row_inserted_id = 0;
priv->row_deleted_id = 0;
@@ -334,16 +319,6 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
g_signal_connect (button, "toggled", G_CALLBACK (on_view_toggled), chooser);
g_object_set_data (G_OBJECT (button), "source", priv->colors_source);
-#ifdef HAVE_LIBSOCIALWEB
- button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (button1), _("Flickr"));
- context = gtk_widget_get_style_context (button);
- gtk_style_context_add_class (context, "raised");
- gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
- gtk_container_add (GTK_CONTAINER (hbox), button);
- g_signal_connect (button, "toggled", G_CALLBACK (on_view_toggled), chooser);
- g_object_set_data (G_OBJECT (button), "source", priv->flickr_source);
-#endif
-
priv->sw_content = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw_content), GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw_content), GTK_SHADOW_IN);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]