Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
2a5764dd
Commit
2a5764dd
authored
Jul 6, 2012
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #13276: gnome: history now always shows up scrolled to the top
parent
5f0fae42
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
gnome/src/uimanager.c
+22
-22
22 additions, 22 deletions
gnome/src/uimanager.c
with
22 additions
and
22 deletions
gnome/src/uimanager.c
+
22
−
22
View file @
2a5764dd
...
@@ -102,10 +102,6 @@ static GtkWidget * imToolbar_;
...
@@ -102,10 +102,6 @@ static GtkWidget * imToolbar_;
static
GtkWidget
*
editable_num_
;
static
GtkWidget
*
editable_num_
;
static
GtkWidget
*
edit_dialog_
;
static
GtkWidget
*
edit_dialog_
;
enum
{
CALLTREE_CALLS
,
CALLTREE_HISTORY
,
CALLTREE_CONTACTS
};
static
void
static
void
remove_from_toolbar
(
GtkWidget
*
widget
)
remove_from_toolbar
(
GtkWidget
*
widget
)
{
{
...
@@ -217,18 +213,13 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
...
@@ -217,18 +213,13 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
if
(
calltab_has_name
(
active_calltree_tab
,
CURRENT_CALLS
))
{
if
(
calltab_has_name
(
active_calltree_tab
,
CURRENT_CALLS
))
{
add_to_toolbar
(
toolbar_
,
hangUpWidget_
,
pos
++
);
add_to_toolbar
(
toolbar_
,
hangUpWidget_
,
pos
++
);
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
}
else
if
(
calltab_has_name
(
active_calltree_tab
,
HISTORY
))
{
else
if
(
calltab_has_name
(
active_calltree_tab
,
HISTORY
))
{
main_window_show_playback_scale
();
main_window_show_playback_scale
();
if
(
is_non_empty
(
selectedCall
->
_recordfile
))
{
if
(
is_non_empty
(
selectedCall
->
_recordfile
))
main_window_set_playback_scale_sensitive
();
main_window_set_playback_scale_sensitive
();
}
else
else
{
main_window_set_playback_scale_unsensitive
();
main_window_set_playback_scale_unsensitive
();
}
}
else
{
}
else
{
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
}
break
;
break
;
...
@@ -331,14 +322,11 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
...
@@ -331,14 +322,11 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
else
if
(
calltab_has_name
(
active_calltree_tab
,
HISTORY
))
{
}
else
if
(
calltab_has_name
(
active_calltree_tab
,
HISTORY
))
{
main_window_show_playback_scale
();
main_window_show_playback_scale
();
if
(
is_non_empty
(
selectedConf
->
_recordfile
))
{
if
(
is_non_empty
(
selectedConf
->
_recordfile
))
main_window_set_playback_scale_sensitive
();
main_window_set_playback_scale_sensitive
();
}
else
else
{
main_window_set_playback_scale_unsensitive
();
main_window_set_playback_scale_unsensitive
();
}
}
else
{
}
else
{
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
}
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
g_signal_handler_unblock
(
recordWidget_
,
recordButtonConnId_
);
...
@@ -944,7 +932,7 @@ call_mailbox_cb(void)
...
@@ -944,7 +932,7 @@ call_mailbox_cb(void)
{
{
account_t
*
current
=
account_list_get_current
();
account_t
*
current
=
account_list_get_current
();
if
(
current
==
NULL
)
// Should not happen
s
if
(
current
==
NULL
)
// Should not happen
return
;
return
;
const
gchar
*
const
to
=
g_hash_table_lookup
(
current
->
properties
,
CONFIG_ACCOUNT_MAILBOX
);
const
gchar
*
const
to
=
g_hash_table_lookup
(
current
->
properties
,
CONFIG_ACCOUNT_MAILBOX
);
...
@@ -961,14 +949,26 @@ call_mailbox_cb(void)
...
@@ -961,14 +949,26 @@ call_mailbox_cb(void)
calltree_display
(
current_calls_tab
);
calltree_display
(
current_calls_tab
);
}
}
static
void
reset_scrollwindow_position
(
calltab_t
*
tab
)
{
GList
*
children
=
gtk_container_get_children
(
GTK_CONTAINER
(
tab
->
tree
));
/* Calltree scrolled window is first element in list */
GtkScrolledWindow
*
scrolled_window
=
GTK_SCROLLED_WINDOW
(
children
->
data
);
g_list_free
(
children
);
GtkAdjustment
*
adjustment
=
gtk_scrolled_window_get_vadjustment
(
scrolled_window
);
gtk_adjustment_set_value
(
adjustment
,
0
.
0
);
}
static
void
static
void
toggle_history_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
toggle_history_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
{
{
if
(
gtk_toggle_action_get_active
(
action
))
{
if
(
gtk_toggle_action_get_active
(
action
))
{
/* Ensure that latest call is visible in history without scrolling */
reset_scrollwindow_position
(
history_tab
);
calltree_display
(
history_tab
);
calltree_display
(
history_tab
);
main_window_show_playback_scale
();
main_window_show_playback_scale
();
}
}
else
{
else
{
calltree_display
(
current_calls_tab
);
calltree_display
(
current_calls_tab
);
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment