Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
65876524
Commit
65876524
authored
Dec 01, 2010
by
Cosimo Cecchi
Browse files
app-chooser-button: don't insert empty rows in the combobox
parent
b17f0338
Changes
1
Hide whitespace changes
Inline
Side-by-side
gtk/gtkappchooserbutton.c
View file @
65876524
...
...
@@ -231,18 +231,22 @@ gtk_app_chooser_button_ensure_dialog_item (GtkAppChooserButton *self,
GtkTreeIter
*
prev_iter
)
{
GIcon
*
icon
;
GtkTreeIter
iter
;
GtkTreeIter
iter
,
iter2
;
if
(
!
self
->
priv
->
show_dialog_item
)
return
;
icon
=
g_themed_icon_new
(
"application-x-executable"
);
gtk_list_store_insert_after
(
self
->
priv
->
store
,
&
iter
,
prev_iter
);
if
(
prev_iter
==
NULL
)
gtk_list_store_append
(
self
->
priv
->
store
,
&
iter
);
else
gtk_list_store_insert_after
(
self
->
priv
->
store
,
&
iter
,
prev_iter
);
real_insert_separator
(
self
,
FALSE
,
&
iter
);
*
prev_
iter
=
iter
;
iter
2
=
iter
;
gtk_list_store_insert_after
(
self
->
priv
->
store
,
&
iter
,
prev_
iter
);
gtk_list_store_insert_after
(
self
->
priv
->
store
,
&
iter
,
&
iter
2
);
real_insert_custom_item
(
self
,
CUSTOM_ITEM_OTHER_APP
,
_
(
"Other application..."
),
icon
,
FALSE
,
&
iter
);
...
...
@@ -257,12 +261,10 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
GAppInfo
*
app
;
GtkTreeIter
iter
,
iter2
;
GIcon
*
icon
;
gboolean
first
;
gboolean
cycled_recommended
;
recommended_apps
=
g_app_info_get_recommended_for_type
(
self
->
priv
->
content_type
);
first
=
TRUE
;
get_first_iter
(
self
->
priv
->
store
,
&
iter
);
cycled_recommended
=
FALSE
;
for
(
l
=
recommended_apps
;
l
!=
NULL
;
l
=
l
->
next
)
{
...
...
@@ -275,14 +277,15 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
else
g_object_ref
(
icon
);
if
(
first
)
if
(
cycled_recommended
)
{
first
=
FALSE
;
gtk_list_store_insert_after
(
self
->
priv
->
store
,
&
iter2
,
&
iter
);
iter
=
iter2
;
}
else
{
g
tk_list_store_insert_af
ter
(
self
->
priv
->
store
,
&
iter2
,
&
iter
);
iter
=
iter2
;
g
et_first_i
ter
(
self
->
priv
->
store
,
&
iter
);
cycled_recommended
=
TRUE
;
}
gtk_list_store_set
(
self
->
priv
->
store
,
&
iter
,
...
...
@@ -295,7 +298,11 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
g_object_unref
(
icon
);
}
gtk_app_chooser_button_ensure_dialog_item
(
self
,
&
iter
);
if
(
!
cycled_recommended
)
gtk_app_chooser_button_ensure_dialog_item
(
self
,
NULL
);
else
gtk_app_chooser_button_ensure_dialog_item
(
self
,
&
iter
);
gtk_combo_box_set_active
(
GTK_COMBO_BOX
(
self
),
0
);
}
...
...
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