Commit 71842380 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #6897: removed unused focus state vars/callbacks

parent 9da0b8a3
...@@ -190,7 +190,6 @@ void sflphone_fill_codec_list (); ...@@ -190,7 +190,6 @@ void sflphone_fill_codec_list ();
void sflphone_fill_codec_list_per_account (account_t *); void sflphone_fill_codec_list_per_account (account_t *);
void sflphone_add_participant(); void sflphone_add_participant();
void sflphone_record (callable_obj_t *c); void sflphone_record (callable_obj_t *c);
......
...@@ -457,18 +457,6 @@ calltree_reset (calltab_t* tab) ...@@ -457,18 +457,6 @@ calltree_reset (calltab_t* tab)
gtk_tree_store_clear (tab->store); gtk_tree_store_clear (tab->store);
} }
static void
focus_on_calltree_out()
{
focus_is_on_calltree = FALSE;
}
static void
focus_on_calltree_in()
{
focus_is_on_calltree = TRUE;
}
void void
calltree_create (calltab_t* tab, gboolean searchbar_type) calltree_create (calltab_t* tab, gboolean searchbar_type)
{ {
...@@ -516,12 +504,6 @@ calltree_create (calltab_t* tab, gboolean searchbar_type) ...@@ -516,12 +504,6 @@ calltree_create (calltab_t* tab, gboolean searchbar_type)
G_CALLBACK (button_pressed), G_CALLBACK (button_pressed),
NULL); NULL);
g_signal_connect_after (G_OBJECT (tab->view), "focus-in-event",
G_CALLBACK (focus_on_calltree_in), NULL);
g_signal_connect_after (G_OBJECT (tab->view), "focus-out-event",
G_CALLBACK (focus_on_calltree_out), NULL);
if (tab != history && tab!=contacts) { if (tab != history && tab!=contacts) {
// Make calltree reordable for drag n drop // Make calltree reordable for drag n drop
......
...@@ -296,25 +296,8 @@ GtkWidget *addressbook_menu_new (void) ...@@ -296,25 +296,8 @@ GtkWidget *addressbook_menu_new (void)
return menu; return menu;
} }
void
focus_on_searchbar_out()
{
DEBUG ("Searchbar: Unset focus from search bar");
// gtk_widget_grab_focus(GTK_WIDGET(sw));
focus_is_on_searchbar = FALSE;
}
void
focus_on_searchbar_in()
{
DEBUG ("Searchbar: Set focus on search bar");
// gtk_widget_grab_focus(GTK_WIDGET(sw));
focus_is_on_searchbar = TRUE;
}
GtkWidget* history_searchbar_new (void) GtkWidget* history_searchbar_new (void)
{ {
GtkWidget *ret, *item, *image; GtkWidget *ret, *item, *image;
ret = gtk_hbox_new (FALSE, 0); ret = gtk_hbox_new (FALSE, 0);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* as that of the covered work. * as that of the covered work.
*/ */
#include <config.h> #include "config.h"
#include "actions.h" #include "actions.h"
#include "calltree.h" #include "calltree.h"
#include "calltab.h" #include "calltab.h"
...@@ -72,6 +72,20 @@ static PidginScrollBook *embedded_error_notebook; ...@@ -72,6 +72,20 @@ static PidginScrollBook *embedded_error_notebook;
static gchar *status_current_message; static gchar *status_current_message;
static GMutex *gmutex; static GMutex *gmutex;
static gboolean focus_is_on_searchbar;
void
focus_on_searchbar_out()
{
focus_is_on_searchbar = FALSE;
}
void
focus_on_searchbar_in()
{
focus_is_on_searchbar = TRUE;
}
/** /**
* Handle main window resizing * Handle main window resizing
*/ */
...@@ -95,9 +109,8 @@ static gboolean window_configure_cb(GtkWidget *win UNUSED, GdkEventConfigure *ev ...@@ -95,9 +109,8 @@ static gboolean window_configure_cb(GtkWidget *win UNUSED, GdkEventConfigure *ev
static gboolean static gboolean
on_delete(GtkWidget * widget UNUSED, gpointer data UNUSED) on_delete(GtkWidget * widget UNUSED, gpointer data UNUSED)
{ {
if (eel_gconf_get_integer(SHOW_STATUSICON)) { if (eel_gconf_get_integer(SHOW_STATUSICON)) {
gtk_widget_hide(GTK_WIDGET(get_main_window())); gtk_widget_hide(get_main_window());
set_minimized(TRUE); set_minimized(TRUE);
} else { } else {
g_mutex_free(gmutex); g_mutex_free(gmutex);
...@@ -166,7 +179,6 @@ on_key_released(GtkWidget *widget UNUSED, GdkEventKey *event, gpointer user_data ...@@ -166,7 +179,6 @@ on_key_released(GtkWidget *widget UNUSED, GdkEventKey *event, gpointer user_data
void void
create_main_window() create_main_window()
{ {
focus_is_on_calltree = FALSE;
focus_is_on_searchbar = FALSE; focus_is_on_searchbar = FALSE;
// Get configuration stored in gconf // Get configuration stored in gconf
......
...@@ -94,14 +94,12 @@ void statusbar_pop_message (guint id); ...@@ -94,14 +94,12 @@ void statusbar_pop_message (guint id);
*/ */
void statusbar_update_clock (const gchar * const time); void statusbar_update_clock (const gchar * const time);
gboolean focus_is_on_calltree;
gboolean focus_is_on_searchbar;
void main_window_zrtp_not_supported (callable_obj_t * c); void main_window_zrtp_not_supported (callable_obj_t * c);
void main_window_zrtp_negotiation_failed (const gchar* callID, const gchar* reason, const gchar* severity); void main_window_zrtp_negotiation_failed (const gchar* callID, const gchar* reason, const gchar* severity);
void main_window_confirm_go_clear (callable_obj_t * c); void main_window_confirm_go_clear (callable_obj_t * c);
void focus_on_searchbar_out();
void focus_on_searchbar_in();
#endif #endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment