From dc0c3cc699c1b91fbf3c9724f5039f3bd1ed0d95 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 19 Feb 2016 23:59:14 +0100 Subject: Introduce Tray Icon for Profanity Add tray icon for profanity based on Gtk StatusIcon. Different icon is displayed in case the user has unread messages. --- src/tray.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/tray.c (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c new file mode 100644 index 00000000..966119c3 --- /dev/null +++ b/src/tray.c @@ -0,0 +1,81 @@ +/* + * tray.c + * + * Copyright (C) 2012 - 2016 David Petroni + * + * This file is part of Profanity. + * + * Profanity 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 3 of the License, or + * (at your option) any later version. + * + * Profanity 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 details. + * + * You should have received a copy of the GNU General Public License + * along with Profanity. If not, see . + * + * In addition, as a special exception, the copyright holders give permission to + * link the code of portions of this program with the OpenSSL library under + * certain conditions as described in each individual source file, and + * distribute linked combinations including the two. + * + * You must obey the GNU General Public License in all respects for all of the + * code used other than OpenSSL. If you modify file(s) with this exception, you + * may extend this exception to your version of the file(s), but you are not + * obligated to do so. If you do not wish to do so, delete this exception + * statement from your version. If you delete this exception statement from all + * source files in the program, then also delete it here. + * + */ + +#include +#include +#include + +#include "tray.h" +#include "window_list.h" + +static GtkStatusIcon *prof_tray = NULL; +static gchar *icon_filename = "src/proIcon.png"; +static gchar *icon_msg_filename = "src/proIconMsg.png"; +static int unread_messages; +static bool shutting_down; +static guint timer; + +gboolean tray_change_icon(gpointer data) +{ + if (shutting_down) { + return false; + } + + unread_messages = wins_get_total_unread(); + + if (unread_messages) { + gtk_status_icon_set_from_file(prof_tray, icon_msg_filename); + } else { + gtk_status_icon_set_from_file(prof_tray, icon_filename); + } + + return true; +} + +void create_tray(void) +{ + prof_tray = gtk_status_icon_new_from_file(icon_filename); + shutting_down = false; + timer = g_timeout_add(5000, tray_change_icon, NULL); +} + +void destroy_tray(void) +{ + shutting_down = true; + g_source_remove(timer); + if (prof_tray) { + gtk_widget_destroy(GTK_WIDGET(prof_tray)); + prof_tray = NULL; + } +} -- cgit 1.4.1-2-gfad0 From 718a708b93102827dfe04ecb63b2331a6a949406 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 7 Mar 2016 22:25:30 +0100 Subject: Use a folder to add icons NOTE: it is not working in this release, I have to get how to retrieve icons from folder. --- Makefile.am | 6 +++++- configure.ac | 6 +++++- icons/proIcon.png | Bin 0 -> 1037 bytes icons/proIconMsg.png | Bin 0 -> 1683 bytes src/proIcon.png | Bin 1037 -> 0 bytes src/proIconMsg.png | Bin 1683 -> 0 bytes src/profanity.c | 6 ++++++ src/tray.c | 28 +++++++++++++++++++++++----- 8 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 icons/proIcon.png create mode 100644 icons/proIconMsg.png delete mode 100644 src/proIcon.png delete mode 100644 src/proIconMsg.png (limited to 'src/tray.c') diff --git a/Makefile.am b/Makefile.am index e737eafa..5cbc77f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,8 @@ otr_unittest_sources = \ themes_sources = themes/* +icons_sources = icons/* + script_sources = bootstrap.sh configure-debug install-all.sh man_sources = docs/profanity.1 @@ -168,6 +170,8 @@ endif if INCLUDE_GIT_VERSION BUILT_SOURCES = $(git_include) endif +profanity_iconsdir = @ICONS_PATH@ +profanity_icons_DATA = $(icons_sources) TESTS = tests/unittests/unittests check_PROGRAMS = tests/unittests/unittests @@ -187,7 +191,7 @@ endif man_MANS = $(man_sources) -EXTRA_DIST = $(man_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt +EXTRA_DIST = $(man_sources) $(icons_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt if INCLUDE_GIT_VERSION EXTRA_DIST += .git/HEAD .git/index diff --git a/configure.ac b/configure.ac index 68e83918..ee4a4707 100644 --- a/configure.ac +++ b/configure.ac @@ -192,6 +192,9 @@ AS_IF([test "x$with_themes" = xno -o "x$with_themes" = xyes -o "x$with_themes" = AC_SUBST(THEMES_PATH) AM_CONDITIONAL([THEMES_INSTALL], "$THEMES_INSTALL") +ICONS_PATH='${pkgdatadir}/icons' +AC_SUBST(ICONS_PATH) + ### cmocka is required only for tests, profanity shouldn't be linked with it ### TODO: pass cmocka_CFLAGS and cmocka_LIBS to Makefile.am PKG_CHECK_MODULES([cmocka], [cmocka], [], @@ -213,7 +216,7 @@ AM_CFLAGS="-Wall -Wno-deprecated-declarations" AS_IF([test "x$PACKAGE_STATUS" = xdevelopment], [AM_CFLAGS="$AM_CFLAGS -Wunused -Werror"]) AM_CPPFLAGS="$AM_CPPFLAGS $glib_CFLAGS $curl_CFLAGS $libnotify_CFLAGS ${GTK_CFLAGS}" -AM_CPPFLAGS="$AM_CPPFLAGS -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\"" +AM_CPPFLAGS="$AM_CPPFLAGS -DICONS_PATH=\"\\\"$ICONS_PATH\\\"\" -DTHEMES_PATH=\"\\\"$THEMES_PATH\\\"\"" LIBS="$glib_LIBS $curl_LIBS $libnotify_LIBS $LIBS ${GTK_LIBS}" AC_SUBST(AM_CFLAGS) @@ -234,5 +237,6 @@ echo "LIBS : $LIBS" echo "XML Parser : $PARSER" echo "Install themes : $THEMES_INSTALL" echo "Themes path : $THEMES_PATH" +echo "Icons path : $ICONS_PATH" echo "" echo "Now you can run \`make' to build profanity" diff --git a/icons/proIcon.png b/icons/proIcon.png new file mode 100644 index 00000000..9043ce57 Binary files /dev/null and b/icons/proIcon.png differ diff --git a/icons/proIconMsg.png b/icons/proIconMsg.png new file mode 100644 index 00000000..249d239e Binary files /dev/null and b/icons/proIconMsg.png differ diff --git a/src/proIcon.png b/src/proIcon.png deleted file mode 100644 index 9043ce57..00000000 Binary files a/src/proIcon.png and /dev/null differ diff --git a/src/proIconMsg.png b/src/proIconMsg.png deleted file mode 100644 index 249d239e..00000000 Binary files a/src/proIconMsg.png and /dev/null differ diff --git a/src/profanity.c b/src/profanity.c index bb5a994a..528e40a9 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -403,6 +403,8 @@ _create_directories(void) GString *themes_dir = g_string_new(xdg_config); g_string_append(themes_dir, "/profanity/themes"); + GString *icons_dir = g_string_new(xdg_config); + g_string_append(icons_dir, "/profanity/icons"); GString *chatlogs_dir = g_string_new(xdg_data); g_string_append(chatlogs_dir, "/profanity/chatlogs"); GString *logs_dir = g_string_new(xdg_data); @@ -411,6 +413,9 @@ _create_directories(void) if (!mkdir_recursive(themes_dir->str)) { log_error("Error while creating directory %s", themes_dir->str); } + if (!mkdir_recursive(icons_dir->str)) { + log_error("Error while creating directory %s", icons_dir->str); + } if (!mkdir_recursive(chatlogs_dir->str)) { log_error("Error while creating directory %s", chatlogs_dir->str); } @@ -419,6 +424,7 @@ _create_directories(void) } g_string_free(themes_dir, TRUE); + g_string_free(icons_dir, TRUE); g_string_free(chatlogs_dir, TRUE); g_string_free(logs_dir, TRUE); diff --git a/src/tray.c b/src/tray.c index 966119c3..c02b3dc7 100644 --- a/src/tray.c +++ b/src/tray.c @@ -40,12 +40,22 @@ #include "window_list.h" static GtkStatusIcon *prof_tray = NULL; -static gchar *icon_filename = "src/proIcon.png"; -static gchar *icon_msg_filename = "src/proIconMsg.png"; +static GString *icon_filename = NULL; +static GString *icon_msg_filename = NULL; static int unread_messages; static bool shutting_down; static guint timer; +static gchar* +_get_icons_dir(void) +{ + gchar *xdg_config = xdg_get_config_home(); + GString *icons_dir = g_string_new(xdg_config); + g_free(xdg_config); + g_string_append(icons_dir, "/profanity/icons"); + return g_string_free(icons_dir, true); +} + gboolean tray_change_icon(gpointer data) { if (shutting_down) { @@ -55,9 +65,9 @@ gboolean tray_change_icon(gpointer data) unread_messages = wins_get_total_unread(); if (unread_messages) { - gtk_status_icon_set_from_file(prof_tray, icon_msg_filename); + gtk_status_icon_set_from_file(prof_tray, icon_msg_filename->str); } else { - gtk_status_icon_set_from_file(prof_tray, icon_filename); + gtk_status_icon_set_from_file(prof_tray, icon_filename->str); } return true; @@ -65,9 +75,15 @@ gboolean tray_change_icon(gpointer data) void create_tray(void) { - prof_tray = gtk_status_icon_new_from_file(icon_filename); + gchar *icons_dir = _get_icons_dir(); + icon_filename = g_string_new(icons_dir); + icon_msg_filename = g_string_new(icons_dir); + g_string_append(icon_filename, "/proIcon.png"); + g_string_append(icon_msg_filename, "/proIconMsg.png"); + prof_tray = gtk_status_icon_new_from_file(icon_filename->str); shutting_down = false; timer = g_timeout_add(5000, tray_change_icon, NULL); + g_free(icons_dir); } void destroy_tray(void) @@ -78,4 +94,6 @@ void destroy_tray(void) gtk_widget_destroy(GTK_WIDGET(prof_tray)); prof_tray = NULL; } + g_string_free(icon_filename, false); + g_string_free(icon_msg_filename, false); } -- cgit 1.4.1-2-gfad0 From 4abdad03ecd3680f17dcccfe3285b14989f758df Mon Sep 17 00:00:00 2001 From: David Date: Wed, 9 Mar 2016 20:09:31 +0100 Subject: Fix icons when installed in share... it is working now! --- src/tray.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index c02b3dc7..999c9446 100644 --- a/src/tray.c +++ b/src/tray.c @@ -49,11 +49,22 @@ static guint timer; static gchar* _get_icons_dir(void) { + GString *icons_dir = NULL; + +#ifdef ICONS_PATH + + icons_dir = g_string_new(ICONS_PATH); + +#else + gchar *xdg_config = xdg_get_config_home(); - GString *icons_dir = g_string_new(xdg_config); + icons_dir = g_string_new(xdg_config); g_free(xdg_config); g_string_append(icons_dir, "/profanity/icons"); - return g_string_free(icons_dir, true); + +#endif /* ICONS_PATH */ + + return g_string_free(icons_dir, false); } gboolean tray_change_icon(gpointer data) @@ -75,15 +86,15 @@ gboolean tray_change_icon(gpointer data) void create_tray(void) { - gchar *icons_dir = _get_icons_dir(); - icon_filename = g_string_new(icons_dir); - icon_msg_filename = g_string_new(icons_dir); + gchar *icons_dir_ret = _get_icons_dir(); + icon_filename = g_string_new(icons_dir_ret); + icon_msg_filename = g_string_new(icons_dir_ret); g_string_append(icon_filename, "/proIcon.png"); g_string_append(icon_msg_filename, "/proIconMsg.png"); prof_tray = gtk_status_icon_new_from_file(icon_filename->str); shutting_down = false; timer = g_timeout_add(5000, tray_change_icon, NULL); - g_free(icons_dir); + g_free(icons_dir_ret); } void destroy_tray(void) -- cgit 1.4.1-2-gfad0 From 82de077b02a80121b6b4351cd60e179fcc4ce0d9 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 10 Mar 2016 22:45:16 +0100 Subject: read icons from local dir if desired, icons could be put in the .config dir. In this case, these icons will be read, instead of the other ones. --- src/tray.c | 55 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 17 deletions(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index 999c9446..f934d836 100644 --- a/src/tray.c +++ b/src/tray.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "tray.h" #include "window_list.h" @@ -42,29 +42,55 @@ static GtkStatusIcon *prof_tray = NULL; static GString *icon_filename = NULL; static GString *icon_msg_filename = NULL; -static int unread_messages; +static gint unread_messages; static bool shutting_down; static guint timer; -static gchar* -_get_icons_dir(void) +static void _get_icons(void) { GString *icons_dir = NULL; #ifdef ICONS_PATH icons_dir = g_string_new(ICONS_PATH); + icon_filename = g_string_new(icons_dir->str); + icon_msg_filename = g_string_new(icons_dir->str); + g_string_append(icon_filename, "/proIcon.png"); + g_string_append(icon_msg_filename, "/proIconMsg.png"); + g_string_free(icons_dir, true); -#else +#endif /* ICONS_PATH */ gchar *xdg_config = xdg_get_config_home(); icons_dir = g_string_new(xdg_config); g_free(xdg_config); g_string_append(icons_dir, "/profanity/icons"); - -#endif /* ICONS_PATH */ - - return g_string_free(icons_dir, false); + GError *err = NULL; + if (!g_file_test(icons_dir->str, G_FILE_TEST_IS_DIR)) { + return; + } + GDir *dir = g_dir_open(icons_dir->str, 0, &err); + if (dir) { + GString *name = g_string_new(g_dir_read_name(dir)); + while (name->len) { + if (g_strcmp0("proIcon.png", name->str) == 0) { + icon_filename = g_string_new(icons_dir->str); + g_string_append(icon_filename, "/proIcon.png"); + } else + if (g_strcmp0("proIconMsg.png", name->str) == 0){ + icon_msg_filename = g_string_new(icons_dir->str); + g_string_append(icon_msg_filename, "/proIconMsg.png"); + } + g_string_free(name, true); + name = g_string_new(g_dir_read_name(dir)); + } + } else { + fprintf (stderr, "Unable to open dir: %s\n", err->message); + g_error_free(err); + } + g_dir_close(dir); + g_free(err); + g_string_free(icons_dir, true); } gboolean tray_change_icon(gpointer data) @@ -86,15 +112,10 @@ gboolean tray_change_icon(gpointer data) void create_tray(void) { - gchar *icons_dir_ret = _get_icons_dir(); - icon_filename = g_string_new(icons_dir_ret); - icon_msg_filename = g_string_new(icons_dir_ret); - g_string_append(icon_filename, "/proIcon.png"); - g_string_append(icon_msg_filename, "/proIconMsg.png"); + _get_icons(); prof_tray = gtk_status_icon_new_from_file(icon_filename->str); shutting_down = false; timer = g_timeout_add(5000, tray_change_icon, NULL); - g_free(icons_dir_ret); } void destroy_tray(void) @@ -105,6 +126,6 @@ void destroy_tray(void) gtk_widget_destroy(GTK_WIDGET(prof_tray)); prof_tray = NULL; } - g_string_free(icon_filename, false); - g_string_free(icon_msg_filename, false); + g_string_free(icon_filename, true); + g_string_free(icon_msg_filename, true); } -- cgit 1.4.1-2-gfad0 From 520eee23a9ddea98ede89bc372f60c720f3ee725 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 12 Mar 2016 16:55:52 +0100 Subject: fixing leakings --- src/tray.c | 31 +++++++++++++++++++++++++++---- src/tray.h | 9 +++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index f934d836..9bd45cf0 100644 --- a/src/tray.c +++ b/src/tray.c @@ -43,9 +43,19 @@ static GtkStatusIcon *prof_tray = NULL; static GString *icon_filename = NULL; static GString *icon_msg_filename = NULL; static gint unread_messages; -static bool shutting_down; +static gboolean shutting_down; static guint timer; +/* {{{ Privates */ + +/* + * Get icons from installation share folder or (if defined) .locale user's folder + * + * As implementation, looking through all the entries in the .locale folder is chosen. + * While useless as now, it might be useful in case an association name-icon is created. + * As now, with 2 icons only, this is pretty useless, but it is not harming ;) + * + */ static void _get_icons(void) { GString *icons_dir = NULL; @@ -74,26 +84,34 @@ static void _get_icons(void) GString *name = g_string_new(g_dir_read_name(dir)); while (name->len) { if (g_strcmp0("proIcon.png", name->str) == 0) { + g_string_free(icon_filename, true); icon_filename = g_string_new(icons_dir->str); g_string_append(icon_filename, "/proIcon.png"); } else if (g_strcmp0("proIconMsg.png", name->str) == 0){ + g_string_free(icon_msg_filename, true); icon_msg_filename = g_string_new(icons_dir->str); g_string_append(icon_msg_filename, "/proIconMsg.png"); } g_string_free(name, true); name = g_string_new(g_dir_read_name(dir)); } + g_string_free(name, true); } else { fprintf (stderr, "Unable to open dir: %s\n", err->message); g_error_free(err); } g_dir_close(dir); - g_free(err); g_string_free(icons_dir, true); } -gboolean tray_change_icon(gpointer data) +/* + * Callback for the timer + * + * This is the callback that the timer is calling in order to check if messages are there. + * + */ +gboolean _tray_change_icon(gpointer data) { if (shutting_down) { return false; @@ -110,12 +128,15 @@ gboolean tray_change_icon(gpointer data) return true; } +/* }}} */ +/* {{{ Public */ + void create_tray(void) { _get_icons(); prof_tray = gtk_status_icon_new_from_file(icon_filename->str); shutting_down = false; - timer = g_timeout_add(5000, tray_change_icon, NULL); + timer = g_timeout_add(5000, _tray_change_icon, NULL); } void destroy_tray(void) @@ -129,3 +150,5 @@ void destroy_tray(void) g_string_free(icon_filename, true); g_string_free(icon_msg_filename, true); } + +/* }}} */ diff --git a/src/tray.h b/src/tray.h index f1973382..6d12329f 100644 --- a/src/tray.h +++ b/src/tray.h @@ -35,7 +35,16 @@ #ifndef PROFANITY_TRAY_H #define PROFANITY_TRAY_H +/* + * Create tray icon + * + * This will initialize the timer that will be called in order to change the icons + * and will search the icons in the defaults paths + */ void create_tray(void); +/* + * Destroy tray icon + */ void destroy_tray(void); #endif -- cgit 1.4.1-2-gfad0 From e43f3e95c0e4f518433f3d5f9f3f59658dae5699 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 13 Mar 2016 17:09:58 +0100 Subject: fix possible free(NULL) --- src/tray.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index 9bd45cf0..84936fa0 100644 --- a/src/tray.c +++ b/src/tray.c @@ -84,12 +84,16 @@ static void _get_icons(void) GString *name = g_string_new(g_dir_read_name(dir)); while (name->len) { if (g_strcmp0("proIcon.png", name->str) == 0) { - g_string_free(icon_filename, true); + if (icon_filename) { + g_string_free(icon_filename, true); + } icon_filename = g_string_new(icons_dir->str); g_string_append(icon_filename, "/proIcon.png"); } else if (g_strcmp0("proIconMsg.png", name->str) == 0){ - g_string_free(icon_msg_filename, true); + if (icon_filename) { + g_string_free(icon_msg_filename, true); + } icon_msg_filename = g_string_new(icons_dir->str); g_string_append(icon_msg_filename, "/proIconMsg.png"); } -- cgit 1.4.1-2-gfad0 From 72856f9b6c915b700c2bfbd8f408612fa26c97c2 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 13 Mar 2016 17:12:01 +0100 Subject: typo --- src/tray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index 84936fa0..e227b68a 100644 --- a/src/tray.c +++ b/src/tray.c @@ -91,7 +91,7 @@ static void _get_icons(void) g_string_append(icon_filename, "/proIcon.png"); } else if (g_strcmp0("proIconMsg.png", name->str) == 0){ - if (icon_filename) { + if (icon_msg_filename) { g_string_free(icon_msg_filename, true); } icon_msg_filename = g_string_new(icons_dir->str); -- cgit 1.4.1-2-gfad0 From 1e60d17d7c32194aa090f8d2ba7d5be4bffc0a44 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 30 Mar 2016 22:18:45 +0200 Subject: libgtk is now optional Having the lib is no more needed. --- configure.ac | 9 +++++++-- src/main.c | 16 ++++++++++++---- src/profanity.c | 32 +++++++++++++++++--------------- src/profanity.h | 2 +- src/tray.c | 6 +++++- src/tray.h | 2 +- 6 files changed, 43 insertions(+), 24 deletions(-) (limited to 'src/tray.c') diff --git a/configure.ac b/configure.ac index 2894ddef..13112c9f 100644 --- a/configure.ac +++ b/configure.ac @@ -62,6 +62,8 @@ AC_ARG_WITH([xscreensaver], [AS_HELP_STRING([--with-xscreensaver], [use libXScrnSaver to determine idle time])]) AC_ARG_WITH([themes], [AS_HELP_STRING([--with-themes[[=PATH]]], [install themes (default yes)])]) +AC_ARG_ENABLE([icons], + [AS_HELP_STRING([--enable-icons], [enable icons])]) ### plugins @@ -153,8 +155,11 @@ PKG_CHECK_MODULES([curl], [libcurl], [], [AC_MSG_ERROR([libcurl is required for profanity])]) # Checks GTK+ 2.0 -PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], [], - [AC_MSG_ERROR([gtk+-2.0 or higher is required for profanity])]) +PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], + [AC_DEFINE([HAVE_GTK], [1], [libgtk module])], + [AS_IF([test "x$enable_icons" = xyes], + [AC_MSG_ERROR([gtk+-2.0 or higher is required for icons])], + [AC_MSG_NOTICE([gtk+-2.0 not found, icons not enabled])])]) AS_IF([test "x$PLATFORM" != xosx], [AC_CHECK_LIB([readline], [main], [], diff --git a/src/main.c b/src/main.c index f080e063..242bf127 100644 --- a/src/main.c +++ b/src/main.c @@ -34,7 +34,9 @@ #include "prof_config.h" +#ifdef PROF_HAVE_GTK #include +#endif #include #include #include @@ -50,7 +52,6 @@ static gboolean version = FALSE; static char *log = "INFO"; static char *account_name = NULL; -static gboolean use_gtk = FALSE; int main(int argc, char **argv) @@ -139,14 +140,21 @@ main(int argc, char **argv) g_print("Python plugins: Disabled\n"); #endif +#ifdef PROF_HAVE_GTK + g_print("GTK icons: Enabled\n"); +#else + g_print("GTK icons: Disabled\n"); +#endif + return 0; } - use_gtk = gtk_init_check(&argc, &argv); - if (use_gtk) { +#ifdef PROF_HAVE_GTK + if (gtk_init_check(&argc, &argv)) { gtk_init(&argc, &argv); } - prof_run(log, account_name, use_gtk); +#endif + prof_run(log, account_name); return 0; } diff --git a/src/profanity.c b/src/profanity.c index 50f564c7..d6c39f06 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -37,7 +37,9 @@ #include "gitversion.h" #endif +#ifdef PROF_HAVE_GTK #include +#endif #include #include #include @@ -73,7 +75,9 @@ #include "window_list.h" #include "event/client_events.h" #include "config/tlscerts.h" +#ifdef PROF_HAVE_GTK #include "tray.h" +#endif static void _check_autoaway(void); static void _init(char *log_level); @@ -94,17 +98,15 @@ char *saved_status; static gboolean cont = TRUE; static gboolean force_quit = FALSE; -static gboolean gtk_enabled = FALSE; void -prof_run(char *log_level, char *account_name, gboolean use_gtk) +prof_run(char *log_level, char *account_name) { - gtk_enabled = use_gtk; _init(log_level); plugins_on_start(); - if (gtk_enabled) { - gtk_main_iteration_do(false); - } +#ifdef PROF_HAVE_GTK + gtk_main_iteration_do(false); +#endif _connect_default(account_name); ui_update(); @@ -137,9 +139,9 @@ prof_run(char *log_level, char *account_name, gboolean use_gtk) jabber_process_events(10); iq_autoping_check(); ui_update(); - if (gtk_enabled) { - gtk_main_iteration_do(false); - } +#ifdef PROF_HAVE_GTK + gtk_main_iteration_do(false); +#endif } } @@ -362,9 +364,9 @@ _init(char *log_level) #endif atexit(_shutdown); plugins_init(); - if (gtk_enabled) { - create_tray(); - } +#ifdef PROF_HAVE_GTK + create_tray(); +#endif inp_nonblocking(TRUE); } @@ -383,9 +385,9 @@ _shutdown(void) if (conn_status == JABBER_CONNECTED) { cl_ev_disconnect(); } - if (gtk_enabled) { - destroy_tray(); - } +#ifdef PROF_HAVE_GTK + destroy_tray(); +#endif jabber_shutdown(); plugins_on_shutdown(); muc_close(); diff --git a/src/profanity.h b/src/profanity.h index b32bbf17..7e128dc8 100644 --- a/src/profanity.h +++ b/src/profanity.h @@ -38,7 +38,7 @@ #include "resource.h" #include "xmpp/xmpp.h" -void prof_run(char *log_level, char *account_name, gboolean use_gtk); +void prof_run(char *log_level, char *account_name); void prof_handle_idle(void); void prof_handle_activity(void); diff --git a/src/tray.c b/src/tray.c index e227b68a..8b078adf 100644 --- a/src/tray.c +++ b/src/tray.c @@ -1,7 +1,7 @@ /* * tray.c * - * Copyright (C) 2012 - 2016 David Petroni + * Copyright (C) 2012 - 2016 James Booth * * This file is part of Profanity. * @@ -32,6 +32,9 @@ * */ +#include "prof_config.h" + +#ifdef PROF_HAVE_GTK #include #include #include @@ -156,3 +159,4 @@ void destroy_tray(void) } /* }}} */ +#endif diff --git a/src/tray.h b/src/tray.h index 6d12329f..416ca7d2 100644 --- a/src/tray.h +++ b/src/tray.h @@ -1,7 +1,7 @@ /* * tray.h * - * Copyright (C) 2012 - 2016 David Petroni + * Copyright (C) 2012 - 2016 James Booth * * This file is part of Profanity. * -- cgit 1.4.1-2-gfad0 From 92a50000c2421604f73ccad4e534948a4dc552e1 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 10 Apr 2016 14:55:06 +0200 Subject: Re-introduce gtk_use boolean This param is still actual, in case the environemnt does not support gtk initialization. Fix a GTK assert on the way (GTKStatusIcon is not a Widget, but a plain GObject). --- src/main.c | 8 -------- src/profanity.c | 29 ++++++++++++++++++++--------- src/tray.c | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) (limited to 'src/tray.c') diff --git a/src/main.c b/src/main.c index 242bf127..431feedc 100644 --- a/src/main.c +++ b/src/main.c @@ -34,9 +34,6 @@ #include "prof_config.h" -#ifdef PROF_HAVE_GTK -#include -#endif #include #include #include @@ -149,11 +146,6 @@ main(int argc, char **argv) return 0; } -#ifdef PROF_HAVE_GTK - if (gtk_init_check(&argc, &argv)) { - gtk_init(&argc, &argv); - } -#endif prof_run(log, account_name); return 0; diff --git a/src/profanity.c b/src/profanity.c index d6c39f06..42f5936b 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -39,6 +39,7 @@ #ifdef PROF_HAVE_GTK #include +#include "tray.h" #endif #include #include @@ -75,9 +76,6 @@ #include "window_list.h" #include "event/client_events.h" #include "config/tlscerts.h" -#ifdef PROF_HAVE_GTK -#include "tray.h" -#endif static void _check_autoaway(void); static void _init(char *log_level); @@ -98,15 +96,21 @@ char *saved_status; static gboolean cont = TRUE; static gboolean force_quit = FALSE; +static gboolean gtk_ready = FALSE; void prof_run(char *log_level, char *account_name) { - _init(log_level); - plugins_on_start(); #ifdef PROF_HAVE_GTK - gtk_main_iteration_do(false); + gtk_ready = gtk_init_check(0, NULL); + log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false"); + if (gtk_ready) { + gtk_init(0, NULL); + gtk_main_iteration_do(false); + } #endif + _init(log_level); + plugins_on_start(); _connect_default(account_name); ui_update(); @@ -140,7 +144,9 @@ prof_run(char *log_level, char *account_name) iq_autoping_check(); ui_update(); #ifdef PROF_HAVE_GTK - gtk_main_iteration_do(false); + if (gtk_ready) { + gtk_main_iteration_do(false); + } #endif } } @@ -365,7 +371,10 @@ _init(char *log_level) atexit(_shutdown); plugins_init(); #ifdef PROF_HAVE_GTK - create_tray(); + if (gtk_ready) { + log_debug("Building GTK icon"); + create_tray(); + } #endif inp_nonblocking(TRUE); } @@ -386,7 +395,9 @@ _shutdown(void) cl_ev_disconnect(); } #ifdef PROF_HAVE_GTK - destroy_tray(); + if (gtk_ready) { + destroy_tray(); + } #endif jabber_shutdown(); plugins_on_shutdown(); diff --git a/src/tray.c b/src/tray.c index 8b078adf..12c46796 100644 --- a/src/tray.c +++ b/src/tray.c @@ -151,7 +151,7 @@ void destroy_tray(void) shutting_down = true; g_source_remove(timer); if (prof_tray) { - gtk_widget_destroy(GTK_WIDGET(prof_tray)); + g_clear_object(&prof_tray); prof_tray = NULL; } g_string_free(icon_filename, true); -- cgit 1.4.1-2-gfad0 From b300fa5baff6530a18e48b3cfec91c77a176f592 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 10 Apr 2016 15:00:25 +0200 Subject: Use log facilities instead of printing on the stderr --- src/tray.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/tray.c') diff --git a/src/tray.c b/src/tray.c index 12c46796..6bb459ed 100644 --- a/src/tray.c +++ b/src/tray.c @@ -41,6 +41,7 @@ #include "tray.h" #include "window_list.h" +#include "log.h" static GtkStatusIcon *prof_tray = NULL; static GString *icon_filename = NULL; @@ -105,7 +106,7 @@ static void _get_icons(void) } g_string_free(name, true); } else { - fprintf (stderr, "Unable to open dir: %s\n", err->message); + log_error("Unable to open dir: %s", err->message); g_error_free(err); } g_dir_close(dir); -- cgit 1.4.1-2-gfad0