Merge pull request #408 from giox069/next

GTK3 migration of remmina_ftp_client, fixes #365
FreeRDP · Dec 12, 2014 · 88d5e60 · 88d5e60
2 parents 1649f77 + e34e657
commit 88d5e60
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/remmina/src/remmina_ftp_client.c b/remmina/src/remmina_ftp_client.c
@@ -117,7 +117,7 @@ remmina_cell_renderer_pixbuf_new(void)
 }
 
 /* --------------------- RemminaFTPClient ----------------------------*/
-G_DEFINE_TYPE( RemminaFTPClient, remmina_ftp_client, GTK_TYPE_VBOX)
+G_DEFINE_TYPE( RemminaFTPClient, remmina_ftp_client, GTK_TYPE_GRID)
 
 #define BUSY_CURSOR \
     if (GDK_IS_WINDOW (gtk_widget_get_window (GTK_WIDGET (client)))) \
@@ -756,21 +756,17 @@ static void remmina_ftp_client_task_list_cell_on_activate(GtkCellRenderer *rende
 	}
 }
 
-static void remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
+static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 {
 	GtkWidget *box;
 	GtkWidget *button;
 	GtkWidget *image;
 	gint i = 0;
 
-#if GTK_VERSION == 3
 	box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-#elif GTK_VERSION == 2
-	box = gtk_hbutton_box_new();
-#endif
 	gtk_widget_show(box);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(box), GTK_BUTTONBOX_START);
-	gtk_box_pack_start(GTK_BOX(client), box, FALSE, TRUE, 0);
+	gtk_grid_attach(GTK_GRID(client), box, 0, 0, 1, 1);
 
 	button = gtk_button_new_with_label(_("Home"));
 	gtk_widget_show(button);
@@ -821,6 +817,8 @@ static void remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_delete), client);
 
 	client->priv->file_action_widgets[i++] = button;
+
+	return box;
 }
 
 void remmina_ftp_client_set_show_hidden(RemminaFTPClient *client, gboolean show_hidden)
@@ -850,6 +848,7 @@ static void remmina_ftp_client_init(RemminaFTPClient *client)
 {
 	RemminaFTPClientPriv *priv;
 	GtkWidget *vpaned;
+	GtkWidget *toolbar;
 	GtkWidget *scrolledwindow;
 	GtkWidget *widget;
 	GtkCellRenderer *renderer;
@@ -860,29 +859,23 @@ static void remmina_ftp_client_init(RemminaFTPClient *client)
 	client->priv = priv;
 
 	/* Main container */
-	gtk_box_set_homogeneous(GTK_BOX(client), FALSE);
-	gtk_box_set_spacing(GTK_BOX(client), 4);
+	gtk_widget_set_vexpand(GTK_WIDGET(client), TRUE);
+	gtk_widget_set_hexpand(GTK_WIDGET(client), TRUE);
 
 	/* Toolbar */
-	remmina_ftp_client_create_toolbar(client);
+	toolbar = remmina_ftp_client_create_toolbar(client);
 
 	/* The Paned to separate File List and Task List */
-#if GTK_VERSION == 3
 	vpaned = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
-#elif GTK_VERSION == 2
-	vpaned = gtk_vpaned_new();
-#endif
+	gtk_widget_set_vexpand(GTK_WIDGET(vpaned), TRUE);
+	gtk_widget_set_hexpand(GTK_WIDGET(vpaned), TRUE);
 	gtk_widget_show(vpaned);
-	gtk_box_pack_start(GTK_BOX(client), vpaned, TRUE, TRUE, 0);
+	gtk_grid_attach_next_to(GTK_GRID(client), vpaned, toolbar, GTK_POS_BOTTOM, 1, 1);
 
 	priv->vpaned = vpaned;
 
 	/* Remote */
-#if GTK_VERSION == 3
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-#elif GTK_VERSION == 2
-	vbox = gtk_vbox_new(FALSE, 0);
-#endif
 	gtk_widget_show(vbox);
 	gtk_paned_pack1(GTK_PANED(vpaned), vbox, TRUE, FALSE);
 
@@ -1212,7 +1205,6 @@ void remmina_ftp_client_update_task(RemminaFTPClient *client, RemminaFTPTask* ta
 	if ( !remmina_masterthread_exec_is_main_thread() ) {
 		/* Allow the execution of this function from a non main thread */
 		RemminaMTExecData *d;
-		gint retval;
 		d = (RemminaMTExecData*)g_malloc( sizeof(RemminaMTExecData) );
 		d->func = FUNC_FTP_CLIENT_UPDATE_TASK;
 		d->p.ftp_client_update_task.client = client;