AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
paperdialog: Drop an unused function

See merge request GNOME/gtk!5099
This commit is contained in:
Matthias Clasen 2022-10-08 03:01:24 +00:00
commit 68b73ebf91
4 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkcustompaperunixdialog.c
View File

@ -197,29 +197,6 @@ _gtk_load_custom_papers (void)
return g_list_reverse (result);
}
void
_gtk_print_load_custom_papers (GtkListStore *store)
{
GtkTreeIter iter;
GList *papers, *p;
GtkPageSetup *page_setup;
gtk_list_store_clear (store);
papers = _gtk_load_custom_papers ();
for (p = papers; p; p = p->next)
{
page_setup = p->data;
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
0, page_setup,
-1);
g_object_unref (page_setup);
}
g_list_free (papers);
}
void
gtk_print_load_custom_papers (GListStore *store)
{

1
gtk/gtkcustompaperunixdialog.h
View File

@ -33,7 +33,6 @@ GType gtk_custom_paper_unix_dialog_get_type (void) G_GNUC_
GtkWidget * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent,
const char *title);
GtkUnit _gtk_print_get_default_user_units (void);
void _gtk_print_load_custom_papers (GtkListStore *store);
void gtk_print_load_custom_papers (GListStore *store);
GList * _gtk_load_custom_papers (void);

16
gtk/gtkplacesview.c
View File

@ -95,9 +95,6 @@ struct _GtkPlacesView
GtkSizeGroup *path_size_group;
GtkSizeGroup *space_size_group;
GtkEntryCompletion *address_entry_completion;
GtkListStore *completion_store;
GCancellable *networks_fetching_cancellable;
GtkPlacesViewRow *row_for_action;
@ -552,12 +549,9 @@ populate_servers (GtkPlacesView *view)
while ((child = gtk_widget_get_first_child (GTK_WIDGET (view->recent_servers_listbox))))
gtk_list_box_remove (GTK_LIST_BOX (view->recent_servers_listbox), child);
gtk_list_store_clear (view->completion_store);
for (i = 0; i < num_uris; i++)
{
RemoveServerData *data;
GtkTreeIter iter;
GtkWidget *row;
GtkWidget *grid;
GtkWidget *button;
@ -568,14 +562,6 @@ populate_servers (GtkPlacesView *view)
name = g_bookmark_file_get_title (server_list, uris[i], NULL);
dup_uri = g_strdup (uris[i]);
/* add to the completion list */
gtk_list_store_append (view->completion_store, &iter);
gtk_list_store_set (view->completion_store,
&iter,
0, name,
1, uris[i],
-1);
/* add to the recent servers listbox */
row = gtk_list_box_row_new ();
@ -2300,8 +2286,6 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, actionbar);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, address_entry);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, address_entry_completion);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, completion_store);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, connect_button);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, listbox);
gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, recent_servers_listbox);

13
gtk/ui/gtkplacesview.ui
View File

@ -1,17 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface domain="gtk40">
<object class="GtkListStore" id="completion_store">
<columns>
<column type="gchararray"/>
<column type="gchararray"/>
</columns>
</object>
<object class="GtkEntryCompletion" id="address_entry_completion">
<property name="model">completion_store</property>
<property name="text-column">1</property>
<property name="inline-completion">1</property>
<property name="popup-completion">0</property>
</object>
<object class="GtkPopover" id="server_adresses_popover">
<property name="position">2</property>
<child>
@ -276,7 +264,6 @@
<property name="width-chars">20</property>
<property name="placeholder-text" translatable="yes">Enter server address…</property>
<property name="secondary-icon-name">dialog-question-symbolic</property>
<property name="completion">address_entry_completion</property>
<signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
<signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
<signal name="icon-press" handler="on_address_entry_show_help_pressed" object="GtkPlacesView" swapped="yes"/>