From de65f505a80ab2cee79fbcc01d24c9eed01691e1 Mon Sep 17 00:00:00 2001 From: James Booth Date: Mon, 18 Apr 2016 00:07:15 +0100 Subject: Moved gtk specific code to tray.c --- src/profanity.c | 23 +++-------------------- src/tray.c | 35 +++++++++++++++++++++++++++++++++++ src/tray.h | 4 ++++ 3 files changed, 42 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/profanity.c b/src/profanity.c index 79d13c08..3c508dcd 100644 --- a/src/profanity.c +++ b/src/profanity.c @@ -38,7 +38,6 @@ #endif #ifdef HAVE_GTK -#include #include "tray.h" #endif #include @@ -96,9 +95,6 @@ char *saved_status; static gboolean cont = TRUE; static gboolean force_quit = FALSE; -#ifdef HAVE_GTK -static gboolean gtk_ready = FALSE; -#endif void prof_run(char *log_level, char *account_name) @@ -138,9 +134,7 @@ prof_run(char *log_level, char *account_name) iq_autoping_check(); ui_update(); #ifdef HAVE_GTK - if (gtk_ready) { - gtk_main_iteration_do(FALSE); - } + tray_update(); #endif } } @@ -365,16 +359,7 @@ _init(char *log_level) atexit(_shutdown); plugins_init(); #ifdef HAVE_GTK - 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); - if (prefs_get_boolean(PREF_TRAY)) { - log_debug("Building GTK icon"); - create_tray(); - } - } + tray_init(); #endif inp_nonblocking(TRUE); } @@ -395,9 +380,7 @@ _shutdown(void) cl_ev_disconnect(); } #ifdef HAVE_GTK - if (gtk_ready && prefs_get_boolean(PREF_TRAY)) { - destroy_tray(); - } + tray_close(); #endif jabber_shutdown(); plugins_on_shutdown(); diff --git a/src/tray.c b/src/tray.c index 98039977..7c731313 100644 --- a/src/tray.c +++ b/src/tray.c @@ -42,7 +42,9 @@ #include "tray.h" #include "window_list.h" #include "log.h" +#include "config/preferences.h" +static gboolean gtk_ready = FALSE; static GtkStatusIcon *prof_tray = NULL; static GString *icon_filename = NULL; static GString *icon_msg_filename = NULL; @@ -140,6 +142,39 @@ _tray_change_icon(gpointer data) /* }}} */ /* {{{ Public */ +void +tray_init(void) +{ + gtk_ready = gtk_init_check(0, NULL); + log_debug("Env is GTK-ready: %s", gtk_ready ? "true" : "false"); + if (!gtk_ready) { + return; + } + + gtk_init(0, NULL); + gtk_main_iteration_do(FALSE); + if (prefs_get_boolean(PREF_TRAY)) { + log_debug("Building GTK icon"); + create_tray(); + } +} + +void +tray_update(void) +{ + if (gtk_ready) { + gtk_main_iteration_do(FALSE); + } +} + +void +tray_close(void) +{ + if (gtk_ready && prefs_get_boolean(PREF_TRAY)) { + destroy_tray(); + } +} + void create_tray(void) { diff --git a/src/tray.h b/src/tray.h index 416ca7d2..98cac490 100644 --- a/src/tray.h +++ b/src/tray.h @@ -35,6 +35,10 @@ #ifndef PROFANITY_TRAY_H #define PROFANITY_TRAY_H +void tray_init(void); +void tray_update(void); +void tray_close(void); + /* * Create tray icon * -- cgit 1.4.1-2-gfad0 re>45c08fea ^ 
d803b687 ^




45c08fea ^












1
2
3
4
5
6
7
8
9

10
11
12
13

14
15
16
17
18
19
20
21
22
23
24
25









                                                                    



                                      











                         
# To check our support for consoles in scenarios, rewrite tests from
# scenario_console.mu
# Tests for console interface.

scenario read-key-in-mu [
  assume-console [
    type [abc]
  ]
  run [
    1:char, 2:bool <- read-key console
    3:char, 4:bool <- read-key console
    5:char, 6:bool <- read-key console
    7:char, 8:bool <- read-key console
  ]
  memory-should-contain [
    1 <- 97  # 'a'
    2 <- 1
    3 <- 98  # 'b'
    4 <- 1
    5 <- 99  # 'c'
    6 <- 1
    7 <- 0  # eof
    8 <- 1
  ]
]
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-26 02:25:56 +0000