diff options
| author | Perberos <[email protected]> | 2012-07-19 17:35:10 -0300 |
|---|---|---|
| committer | Perberos <[email protected]> | 2012-07-19 17:35:10 -0300 |
| commit | 003aa8f9465d4a05c54bf8017ecfa630f90c5bec (patch) | |
| tree | 96fa93665f4f4bbdce17b2c8fc7ab76e9d727bd8 | |
| parent | 78f1e23185a2853a41e536caf07f9c6dc1208ecd (diff) | |
| download | mate-desktop-003aa8f9465d4a05c54bf8017ecfa630f90c5bec.tar.bz2 mate-desktop-003aa8f9465d4a05c54bf8017ecfa630f90c5bec.tar.xz | |
removing nyancat due copyleft incompatible
| -rw-r--r-- | distro/archlinux/PKGBUILD | 3 | ||||
| -rw-r--r-- | mate-about/Makefile.am | 3 | ||||
| -rw-r--r-- | mate-about/mate-about.c | 84 | ||||
| -rw-r--r-- | mate-about/nyan-cat.gif | bin | 24975 -> 0 bytes | |||
| -rw-r--r-- | mate-about/nyan-cat_navideno_v3.png | bin | 1110 -> 0 bytes |
5 files changed, 2 insertions, 88 deletions
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD index a4f440e..3978481 100644 --- a/distro/archlinux/PKGBUILD +++ b/distro/archlinux/PKGBUILD @@ -22,8 +22,7 @@ build() { --disable-static \ --disable-scrollkeeper \ --disable-startup-notification \ - --enable-unique \ - --disable-nyancat || return 1 + --enable-unique || return 1 # --with-gtk=3.0 make || return 1 } diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am index cf7e8c3..e6aae48 100644 --- a/mate-about/Makefile.am +++ b/mate-about/Makefile.am @@ -11,9 +11,6 @@ INCLUDES = \ @INTLTOOL_DESKTOP_RULE@ -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = nyan-cat_navideno_v3.png nyan-cat.gif - desktopdir = $(datadir)/applications desktop_in_files = mate-about.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c index f40c689..9dea770 100644 --- a/mate-about/mate-about.c +++ b/mate-about/mate-about.c @@ -34,37 +34,6 @@ //class mate_about //{ - // what a mess! - #ifndef DISABLE_NYANCAT - - // 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) @@ -108,58 +77,7 @@ gtk_window_set_default_icon_name(icon); /* logo */ - #ifndef DISABLE_NYANCAT - - /* hacemos una comprovacion de la fecha, para mostrar el nyancat - * version navideña. */ - gboolean christmas_is = 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) - { - christmas_is = TRUE; - } - } - - g_date_free(d); - - - if (christmas_is == TRUE) - { - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "nyan-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 "nyan-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/nyan-cat.gif b/mate-about/nyan-cat.gif Binary files differdeleted file mode 100644 index e224e04..0000000 --- a/mate-about/nyan-cat.gif +++ /dev/null diff --git a/mate-about/nyan-cat_navideno_v3.png b/mate-about/nyan-cat_navideno_v3.png Binary files differdeleted file mode 100644 index 69e35ef..0000000 --- a/mate-about/nyan-cat_navideno_v3.png +++ /dev/null |
