From: Charles Kerr <charles@transmissionbt.com>
Date: Sat, 25 Dec 2010 02:05:15 +0000 (+0000)
Subject: (trunk gtk) GTK_DIALOG_NO_SEPARATOR will be removed in GTK 3, so don't use it.
X-Git-Tag: 2.20b1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a160aec4943cb7154e8698584fa60345b89a60c;p=transmission

(trunk gtk) GTK_DIALOG_NO_SEPARATOR will be removed in GTK 3, so don't use it.
---

diff --git a/gtk/add-dialog.c b/gtk/add-dialog.c
index fed5e8cdc..4d5756d2e 100644
--- a/gtk/add-dialog.c
+++ b/gtk/add-dialog.c
@@ -273,8 +273,7 @@ gtr_torrent_options_dialog_new( GtkWindow * parent, TrCore * core, tr_ctor * cto
 
     /* make the dialog */
     d = gtk_dialog_new_with_buttons( _( "Torrent Options" ), parent,
-                                     GTK_DIALOG_DESTROY_WITH_PARENT |
-                                     GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                      NULL );
     gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
     grab = gtk_dialog_add_button( GTK_DIALOG( d ), GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT );
@@ -523,7 +522,7 @@ gtr_torrent_add_from_url_dialog_new( GtkWindow * parent, TrCore * core )
     GtkWidget * w;
 
     w = gtk_dialog_new_with_buttons( _( "Add URL" ), parent,
-                                     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                      GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
                                      NULL );
diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index e243c289d..046b3a56c 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -433,8 +433,7 @@ gtr_torrent_creation_dialog_new( GtkWindow  * parent, TrCore * core )
 
     d = gtk_dialog_new_with_buttons( _( "New Torrent" ),
                                      parent,
-                                     GTK_DIALOG_DESTROY_WITH_PARENT |
-                                     GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
                                      GTK_STOCK_NEW, GTK_RESPONSE_ACCEPT,
                                      NULL );
diff --git a/gtk/relocate.c b/gtk/relocate.c
index b6c021a6b..4e3d29ee8 100644
--- a/gtk/relocate.c
+++ b/gtk/relocate.c
@@ -157,8 +157,7 @@ gtr_relocate_dialog_new( GtkWindow * parent,
 
     d = gtk_dialog_new_with_buttons( _( "Set Torrent Location" ), parent,
                                      GTK_DIALOG_DESTROY_WITH_PARENT |
-                                     GTK_DIALOG_MODAL |
-                                     GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_MODAL,
                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                      GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
                                      NULL );
diff --git a/gtk/stats.c b/gtk/stats.c
index 2a61cd217..527d3a6f2 100644
--- a/gtk/stats.c
+++ b/gtk/stats.c
@@ -145,8 +145,7 @@ gtr_stats_dialog_new( GtkWindow * parent, TrCore * core )
 
     d = gtk_dialog_new_with_buttons( _( "Statistics" ),
                                      parent,
-                                     GTK_DIALOG_DESTROY_WITH_PARENT |
-                                     GTK_DIALOG_NO_SEPARATOR,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
                                      _( "_Reset" ), TR_RESPONSE_RESET,
                                      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
                                      NULL );