Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
130
Issues
130
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
292be9d5
Commit
292be9d5
authored
May 17, 2012
by
Tristan Matthews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* #11207: fixed history search bar
parent
6f1a61e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
31 deletions
+23
-31
gnome/src/contacts/calltree.c
gnome/src/contacts/calltree.c
+1
-10
gnome/src/contacts/calltree.h
gnome/src/contacts/calltree.h
+12
-0
gnome/src/contacts/history.c
gnome/src/contacts/history.c
+10
-21
No files found.
gnome/src/contacts/calltree.c
View file @
292be9d5
...
...
@@ -79,15 +79,6 @@ static GtkTargetEntry target_list[] = {
static
const
guint
n_targets
=
G_N_ELEMENTS
(
target_list
);
enum
{
COLUMN_ACCOUNT_PIXBUF
=
0
,
COLUMN_ACCOUNT_DESC
,
COLUMN_ACCOUNT_SECURITY_PIXBUF
,
COLUMN_ID
,
COLUMN_IS_CONFERENCE
,
COLUMNS_IN_TREE_STORE
};
/**
* Show popup menu
*/
...
...
@@ -100,7 +91,7 @@ popup_menu(GtkWidget *widget,
}
/* Returns TRUE if row contains a conference object pointer */
static
gboolean
gboolean
is_conference
(
GtkTreeModel
*
model
,
GtkTreeIter
*
iter
)
{
gboolean
result
=
FALSE
;
...
...
gnome/src/contacts/calltree.h
View file @
292be9d5
...
...
@@ -106,4 +106,16 @@ calltree_display (calltab_t *);
gboolean
calltree_update_clock
(
gpointer
);
gboolean
is_conference
(
GtkTreeModel
*
model
,
GtkTreeIter
*
iter
);
enum
{
COLUMN_ACCOUNT_PIXBUF
=
0
,
COLUMN_ACCOUNT_DESC
,
COLUMN_ACCOUNT_SECURITY_PIXBUF
,
COLUMN_ID
,
COLUMN_IS_CONFERENCE
,
COLUMNS_IN_TREE_STORE
};
#endif
gnome/src/contacts/history.c
View file @
292be9d5
...
...
@@ -54,45 +54,34 @@ search_type_matches_state(SearchType type, const gchar *state)
static
gboolean
history_is_visible
(
GtkTreeModel
*
model
,
GtkTreeIter
*
iter
,
gpointer
data
UNUSED
)
{
gboolean
ret
=
TRUE
;
callable_obj_t
*
history_entry
=
NULL
;
const
gchar
*
text
=
NULL
;
/* Skip conferences */
if
(
is_conference
(
model
,
iter
))
return
TRUE
;
// Fetch the call description
GValue
val
;
memset
(
&
val
,
0
,
sizeof
val
);
gtk_tree_model_get_value
(
GTK_TREE_MODEL
(
model
),
iter
,
1
,
&
val
);
if
(
G_VALUE_HOLDS_STRING
(
&
val
))
text
=
(
gchar
*
)
g_value_get_string
(
&
val
);
// Fetch the call type
GValue
obj
;
memset
(
&
obj
,
0
,
sizeof
obj
);
gtk_tree_model_get_value
(
GTK_TREE_MODEL
(
model
),
iter
,
3
,
&
obj
);
if
(
G_VALUE_HOLDS_POINTER
(
&
obj
))
history_entry
=
(
gpointer
)
g_value_get_pointer
(
&
obj
);
const
gchar
*
text
=
NULL
;
const
gchar
*
id
=
NULL
;
gtk_tree_model_get
(
model
,
iter
,
COLUMN_ACCOUNT_DESC
,
&
text
,
COLUMN_ID
,
&
id
,
-
1
);
callable_obj_t
*
history_entry
=
calllist_get_call
(
history_tab
,
id
);
gboolean
ret
=
TRUE
;
if
(
text
&&
history_entry
)
{
// Filter according to the type of call
// MISSED, INCOMING, OUTGOING, ALL
const
gchar
*
search
=
gtk_entry_get_text
(
history_searchbar_widget
);
if
(
!
search
||
!*
search
)
goto
end
;
return
TRUE
;
SearchType
search_type
=
get_current_history_search_type
();
ret
=
g_regex_match_simple
(
search
,
text
,
G_REGEX_CASELESS
,
0
);
if
(
search_type
==
SEARCH_ALL
)
goto
end
;
return
ret
;
else
// We need a match on the history_state and the current search type
ret
=
ret
&&
search_type_matches_state
(
search_type
,
history_entry
->
_history_state
);
}
end:
g_value_unset
(
&
val
);
return
ret
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment