From e2f5b1e11f142174ad795019b0df8a24e594178b Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 8 Jan 2011 12:48:53 +0200 Subject: [PATCH] * mug: don't make it installable, it's just a toy --- toys/Makefile.am | 5 + toys/mug/Makefile.am | 25 +-- toys/mug/mug.cc | 18 +- toys/mug/mug.desktop.in | 12 -- toys/mug/mug.svg | 443 ---------------------------------------- 5 files changed, 18 insertions(+), 485 deletions(-) delete mode 100644 toys/mug/mug.desktop.in delete mode 100644 toys/mug/mug.svg diff --git a/toys/Makefile.am b/toys/Makefile.am index 22f6fc08..1550c4d7 100644 --- a/toys/Makefile.am +++ b/toys/Makefile.am @@ -23,3 +23,8 @@ if HAVE_GTK SUBDIRS += mug endif +# for mug2, we need webkit +if HAVE_WEBKIT +SUBDIRS += mug2 +endif + diff --git a/toys/mug/Makefile.am b/toys/mug/Makefile.am index c7854505..235473be 100644 --- a/toys/mug/Makefile.am +++ b/toys/mug/Makefile.am @@ -2,7 +2,7 @@ ## ## 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 -## t he Free Software Foundation; either version 3 of the License, or +## the Free Software Foundation; either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,12 +19,8 @@ include $(top_srcdir)/gtest.mk # enforce compiling this dir first before decending into tests/ SUBDIRS= . -#if HAVE_GTEST -#SUBDIRS += tests -#endif -INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) -DICONDIR='"$(icondir)"' \ - -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE +INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) -DICONDIR='"$(icondir)"' # don't use -Werror, as it might break on other compilers # use -Wno-unused-parameters, because some callbacks may not @@ -33,7 +29,7 @@ AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter -bin_PROGRAMS= \ +noinst_PROGRAMS= \ mug # note, mug.cc is '.cc' only because libmu must explicitly @@ -53,20 +49,5 @@ mug_LDADD= \ ${top_builddir}/src/libmu.la \ ${GTK_LIBS} -icondir= \ - $(datarootdir)/icons - -icon_DATA= \ - mug.svg - -desktopdir= \ - $(datarootdir)/applications - -desktop_DATA= \ - mug.desktop - -EXTRA_DIST= \ - $(desktop_DATA) \ - $(icon_DATA) diff --git a/toys/mug/mug.cc b/toys/mug/mug.cc index 565ccabe..4f13e6b9 100644 --- a/toys/mug/mug.cc +++ b/toys/mug/mug.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2010 Dirk-Jan C. Binnema +** Copyright (C) 2010-2011 Dirk-Jan C. Binnema ** ** 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 @@ -19,7 +19,7 @@ #if HAVE_CONFIG_H #include "config.h" -#endif /*HAVE_CONFIG */ +#endif /*HAVE_CONFIG*/ #include #include /* for memset */ @@ -53,7 +53,7 @@ about_mug (MugData * mugdata) GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Mug version %s\n" "A graphical frontend to the 'mu' e-mail search engine\n\n" - "(c) 2010 Dirk-Jan C. Binnema\n" + "(c) 2010-2011 Dirk-Jan C. Binnema\n" "Released under the terms of the GPLv3+", VERSION); gtk_dialog_run (GTK_DIALOG (about)); @@ -314,7 +314,6 @@ GtkWidget * mug_shell (MugData * mugdata) { GtkWidget *vbox; - gchar *icon; mugdata->win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (mugdata->win), "Mug Mail Search"); @@ -335,10 +334,13 @@ mug_shell (MugData * mugdata) gtk_window_set_default_size (GTK_WINDOW (mugdata->win), 700, 500); gtk_window_set_resizable (GTK_WINDOW (mugdata->win), TRUE); - icon = g_strdup_printf ("%s%cmug.svg", ICONDIR, G_DIR_SEPARATOR); - gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL); - g_free (icon); - + // { + // gchar *icon; + // icon = g_strdup_printf ("%s%cmug.svg", ICONDIR, G_DIR_SEPARATOR); + // gtk_window_set_icon_from_file (GTK_WINDOW (mugdata->win), icon, NULL); + // g_free (icon); + // } + return mugdata->win; } diff --git a/toys/mug/mug.desktop.in b/toys/mug/mug.desktop.in deleted file mode 100644 index 8a60306c..00000000 --- a/toys/mug/mug.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=@PACKAGE_VERSION@ -Type=Application -Name=Mug -GenericName=Mail Searcher -Comment=A UI for the mu mail searcher -Exec=@prefix@/bin/mug -X-Text-Domain=mu -Terminal=false -Icon=mug -StartupWMClass=mug -MimeType=application/x-executable; diff --git a/toys/mug/mug.svg b/toys/mug/mug.svg deleted file mode 100644 index b2ddb5c0..00000000 --- a/toys/mug/mug.svg +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - -