Remove gnucatmate-desktop-1.6.0

author: Stefano Karapetsas <[email protected]> 2013-04-01 02:17:45 +0200
committer: Stefano Karapetsas <[email protected]> 2013-04-01 02:17:45 +0200
commit: 79815e492ffa5e7177bf7796b775cedbaa926c06 (patch)
tree: 7298fa418ff278d1de30a0753f11803e72479e7f
parent: c0ae11d1fbd070b58b9daadd4e5fd533ee2bbb4b (diff)
download: mate-desktop-79815e492ffa5e7177bf7796b775cedbaa926c06.tar.bz2
mate-desktop-79815e492ffa5e7177bf7796b775cedbaa926c06.tar.xz
6 files changed, 3 insertions, 97 deletions
diff --git a/configure.ac b/configure.ac
index 51882e1..c5d3d88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,15 +230,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 
 AM_GLIB_GNU_GETTEXT
 
-AC_ARG_ENABLE([gnucat],
- [AS_HELP_STRING([--enable-gnucat], [enable the use of gnu cat as logo in mate-about])],
- [enable_gnucat=yes], [enable_gnucat=no])
-
-if test "x$enable_gnucat" = "xyes"; then
- MATE_ABOUT_CFLAGS="$MATE_ABOUT_CFLAGS -DENABLE_GNUCAT=1"
-fi
-AM_CONDITIONAL(GNUCAT_ENABLED, test "x$enable_gnucat" = "xyes")
-
 dnl ============================================================================
 dnl | se comprueba unique
 dnl | de lo contrario, se intenta utilizar libunique
@@ -343,5 +334,4 @@ mate-desktop $VERSION `echo mate-desktop $VERSION | sed "s/./=/g"`
 Startup notification support: ${have_startup_notification}
 XRandr support: ${have_randr}
 Build gtk-doc documentation: ${enable_gtk_doc}
- Enable gnucat: ${enable_gnucat}
 "
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index 055a031..51cbdb4 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -11,11 +11,6 @@ AM_CPPFLAGS = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-if GNUCAT_ENABLED
-pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = gnu-cat_navideno_v3.png gnu-cat.gif
-endif
-
 desktopdir = $(datadir)/applications
 desktop_in_files = mate-about.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
diff --git a/mate-about/gnu-cat.gif b/mate-about/gnu-cat.gif
deleted file mode 100644
index e2af35f..0000000
--- a/mate-about/gnu-cat.gif
+++ /dev/null
diff --git a/mate-about/gnu-cat_navideno_v3.png b/mate-about/gnu-cat_navideno_v3.png
deleted file mode 100644
index 802f89f..0000000
--- a/mate-about/gnu-cat_navideno_v3.png
+++ /dev/null
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c
index e1fb942..f5f8496 100644
--- a/mate-about/mate-about.c
+++ b/mate-about/mate-about.c
@@ -32,37 +32,6 @@
 textdomain(package);
 #endif
 
- // what a mess!
- #ifdef ENABLE_GNUCAT
-
- // Thanks! http://www.gtkforums.com/viewtopic.php?t=1639
- typedef struct _iter_arg {
- GtkWidget* widget;
- GdkPixbufAnimation* animation;
- GdkPixbufAnimationIter* iter;
- } iter_arg_t;
-
- gboolean on_animation_frame(iter_arg_t* object)
- {
- if (object->widget == NULL)
- {
- return FALSE;
- }
-
- static gint frame = 1;
-
- if (gdk_pixbuf_animation_iter_advance(object->iter, NULL))
- {
- frame++;
-
- gtk_about_dialog_set_logo((GtkAboutDialog*) object->widget, gdk_pixbuf_animation_iter_get_pixbuf(object->iter));
- }
-
- return TRUE;
- }
-
- #endif
-
 #if GTK_CHECK_VERSION(3, 0, 0) && !defined(UNIQUE)
 
 static void mate_about_on_activate(GtkApplication* app)
@@ -105,56 +74,7 @@
 
 gtk_window_set_default_icon_name(icon);
 
- #ifdef ENABLE_GNUCAT
-
- /* check if it's christmas, to show a different image */
- gboolean is_christmas = FALSE;
-
- GDate* d = g_date_new();
- g_date_set_time_t(d, (time_t) time(NULL));
-
- if (g_date_get_month(d) == G_DATE_DECEMBER)
- {
- GDateDay day = g_date_get_day(d);
-
- if (day >= 24 && day <=25)
- {
- is_christmas = TRUE;
- }
- }
-
- g_date_free(d);
-
- if (is_christmas == TRUE)
- {
- GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "gnu-cat_navideno_v3.png", NULL);
- gtk_about_dialog_set_logo(mate_about_dialog, pixbuf);
- g_object_unref(pixbuf);
- }
- else
- {
- iter_arg_t animation_object;
- GdkPixbufAnimation* animation;
- GdkPixbufAnimationIter *iter;
- GtkWidget* image;
-
- animation = gdk_pixbuf_animation_new_from_file(PIXMAPS_DIR "gnu-cat.gif", NULL);
-
- if (animation != NULL)
- {
- iter = gdk_pixbuf_animation_get_iter(animation, NULL);
-
- animation_object.animation = animation;
- animation_object.iter = iter;
- animation_object.widget = (GtkWidget*) mate_about_dialog;
-
- gtk_about_dialog_set_logo(mate_about_dialog, gdk_pixbuf_animation_iter_get_pixbuf(iter));
-
- g_timeout_add(gdk_pixbuf_animation_iter_get_delay_time(iter), (GSourceFunc) on_animation_frame, (gpointer) &animation_object);
- }
- }
-
- #elif GTK_CHECK_VERSION(3, 0, 0) || GTK_CHECK_VERSION(2, 6, 0)
+ #if GTK_CHECK_VERSION(3, 0, 0) || GTK_CHECK_VERSION(2, 6, 0)
 
 gtk_about_dialog_set_logo_icon_name(mate_about_dialog, icon);
 
diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h
index fc8f0b4..fd74b1c 100644
--- a/mate-about/mate-about.h
+++ b/mate-about/mate-about.h
@@ -626,8 +626,9 @@
 };
 // artists
 const char* artists[] = {
+ "Marcel Dijkstra <[email protected]>",
 "Rowen Stipe <[email protected]>",
- "/g/entoomen <https://boards.4chan.org/g/>",
+ "Wolfgang Ulbrich <[email protected]>",
 NULL
 };
author	Stefano Karapetsas <[email protected]>	2013-04-01 02:17:45 +0200
committer	Stefano Karapetsas <[email protected]>	2013-04-01 02:17:45 +0200
commit	79815e492ffa5e7177bf7796b775cedbaa926c06 (patch)
tree	7298fa418ff278d1de30a0753f11803e72479e7f
parent	c0ae11d1fbd070b58b9daadd4e5fd533ee2bbb4b (diff)
download	mate-desktop-79815e492ffa5e7177bf7796b775cedbaa926c06.tar.bz2 mate-desktop-79815e492ffa5e7177bf7796b775cedbaa926c06.tar.xz