From 2176a84cfbc158f21a92c8c2d1c26922c217e0df Mon Sep 17 00:00:00 2001 From: infirit Date: Wed, 5 Feb 2014 00:05:23 +0100 Subject: Remove all calls gtk_dialog_set_has_separator Also remove the has_separator from the ui files. --- battstat/battstat_applet.c | 7 ------- battstat/battstat_applet.ui | 1 - battstat/properties.c | 4 ---- charpick/properties.c | 3 --- cpufreq/cpufreq-preferences.ui | 1 - geyes/themes.c | 7 ------- invest-applet/data/prefs-dialog.ui | 1 - mateweather/mateweather-dialog.c | 3 --- mateweather/mateweather-pref.c | 3 --- modemlights/modemlights.ui | 1 - multiload/properties.c | 3 --- stickynotes/stickynotes.ui | 4 ---- trashapplet/src/trashapplet.c | 3 --- trashapplet/trashapplet-empty-progress.ui | 1 - 14 files changed, 42 deletions(-) diff --git a/battstat/battstat_applet.c b/battstat/battstat_applet.c index 52cc9f3c..5a8f58f9 100644 --- a/battstat/battstat_applet.c +++ b/battstat/battstat_applet.c @@ -524,9 +524,6 @@ battery_full_dialog (GtkWidget *applet) #endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif hbox = gtk_hbox_new (FALSE, 6); pixbuf = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default (), @@ -691,10 +688,6 @@ battery_low_dialog( ProgressData *battery, BatteryStatus *info ) gtk_container_set_border_width (GTK_CONTAINER (battery->battery_low_dialog), 6); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (battery->battery_low_dialog), - FALSE); -#endif hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), diff --git a/battstat/battstat_applet.ui b/battstat/battstat_applet.ui index 77d21a8a..af5e9a87 100644 --- a/battstat/battstat_applet.ui +++ b/battstat/battstat_applet.ui @@ -13,7 +13,6 @@ 5 Battery Charge Monitor Preferences dialog - False True diff --git a/battstat/properties.c b/battstat/properties.c index 634290ce..f84eea78 100644 --- a/battstat/properties.c +++ b/battstat/properties.c @@ -411,10 +411,6 @@ prop_cb (GtkAction *action, gtk_dialog_set_default_response (GTK_DIALOG (battstat->prop_win), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (battstat->prop_win), FALSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (battstat->prop_win), FALSE); -#endif - g_signal_connect (G_OBJECT (battstat->prop_win), "response", G_CALLBACK (response_cb), battstat); gtk_widget_show_all (GTK_WIDGET (battstat->prop_win)); diff --git a/charpick/properties.c b/charpick/properties.c index 80bea55c..8038af58 100644 --- a/charpick/properties.c +++ b/charpick/properties.c @@ -549,9 +549,6 @@ show_preferences_dialog (GtkAction *action, gtk_container_set_border_width (GTK_CONTAINER (curr_data->propwindow), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (curr_data->propwindow))), 2); gtk_dialog_set_default_response (GTK_DIALOG (curr_data->propwindow), GTK_RESPONSE_CLOSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (curr_data->propwindow), FALSE); -#endif default_chars_frame_create(curr_data); g_signal_connect (G_OBJECT (curr_data->propwindow), "response", diff --git a/cpufreq/cpufreq-preferences.ui b/cpufreq/cpufreq-preferences.ui index 78530f0b..33d719e0 100644 --- a/cpufreq/cpufreq-preferences.ui +++ b/cpufreq/cpufreq-preferences.ui @@ -8,7 +8,6 @@ False True dialog - False True diff --git a/geyes/themes.c b/geyes/themes.c index 0f5ee028..fea26060 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -130,10 +130,6 @@ load_theme (EyesApplet *eyes_applet, const gchar *theme_dir) _("Can not launch the eyes applet."), _("There was a fatal error while trying to load the theme.")); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif - gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); @@ -297,9 +293,6 @@ properties_cb (GtkAction *action, gtk_widget_set_size_request (GTK_WIDGET (pbox), 300, 200); gtk_dialog_set_default_response(GTK_DIALOG (pbox), GTK_RESPONSE_CLOSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (pbox), FALSE); -#endif gtk_container_set_border_width (GTK_CONTAINER (pbox), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pbox))), 2); diff --git a/invest-applet/data/prefs-dialog.ui b/invest-applet/data/prefs-dialog.ui index e5998393..0e83e372 100644 --- a/invest-applet/data/prefs-dialog.ui +++ b/invest-applet/data/prefs-dialog.ui @@ -10,7 +10,6 @@ 450 True dialog - False diff --git a/mateweather/mateweather-dialog.c b/mateweather/mateweather-dialog.c index 7ea07e17..af71d319 100644 --- a/mateweather/mateweather-dialog.c +++ b/mateweather/mateweather-dialog.c @@ -187,9 +187,6 @@ static void mateweather_dialog_create(MateWeatherDialog* dialog) GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 40aabd74..2fb8a116 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -824,9 +824,6 @@ static void mateweather_pref_create(MateWeatherPref* pref) gtk_window_set_title (GTK_WINDOW (pref), _("Weather Preferences")); gtk_dialog_add_buttons (GTK_DIALOG (pref), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL); gtk_dialog_set_default_response (GTK_DIALOG (pref), GTK_RESPONSE_CLOSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (pref), FALSE); -#endif gtk_container_set_border_width (GTK_CONTAINER (pref), 5); gtk_window_set_resizable (GTK_WINDOW (pref), TRUE); gtk_window_set_screen (GTK_WINDOW (pref), gtk_widget_get_screen (GTK_WIDGET (pref->priv->applet->applet))); diff --git a/modemlights/modemlights.ui b/modemlights/modemlights.ui index 920050da..f2161106 100644 --- a/modemlights/modemlights.ui +++ b/modemlights/modemlights.ui @@ -8,7 +8,6 @@ True center dialog - False True diff --git a/multiload/properties.c b/multiload/properties.c index 9dd3cf6a..082378a9 100644 --- a/multiload/properties.c +++ b/multiload/properties.c @@ -637,9 +637,6 @@ multiload_properties_cb (GtkAction *action, gtk_widget_get_screen (GTK_WIDGET (ma->applet))); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2); diff --git a/stickynotes/stickynotes.ui b/stickynotes/stickynotes.ui index cc98a1e4..016ceeef 100644 --- a/stickynotes/stickynotes.ui +++ b/stickynotes/stickynotes.ui @@ -62,7 +62,6 @@ Sticky Notes Preferences False dialog - False True @@ -507,7 +506,6 @@ False True dialog - False True @@ -626,7 +624,6 @@ 5 False dialog - False True @@ -920,7 +917,6 @@ Sticky Note Properties False dialog - False True diff --git a/trashapplet/src/trashapplet.c b/trashapplet/src/trashapplet.c index 5cca0fc4..65964cda 100644 --- a/trashapplet/src/trashapplet.c +++ b/trashapplet/src/trashapplet.c @@ -464,9 +464,6 @@ confirm_delete_immediately (GtkWidget *parent_view, gtk_window_set_screen (GTK_WINDOW (dialog), screen); atk_object_set_role (gtk_widget_get_accessible (dialog), ATK_ROLE_ALERT); gtk_window_set_title (GTK_WINDOW (dialog), _("Delete Immediately?")); -#if !GTK_CHECK_VERSION (3, 0, 0) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); -#endif gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); diff --git a/trashapplet/trashapplet-empty-progress.ui b/trashapplet/trashapplet-empty-progress.ui index 1b075d61..4be55853 100644 --- a/trashapplet/trashapplet-empty-progress.ui +++ b/trashapplet/trashapplet-empty-progress.ui @@ -7,7 +7,6 @@ Emptying the Trash 400 normal - False -- cgit v1.2.1