cpw.qulogic.gtk3-required: 8c00e3b4: There is no separator in GTK+3 dialogs a...
qulogic at pidgin.im
qulogic at pidgin.im
Sun May 27 00:35:06 EDT 2012
----------------------------------------------------------------------
Revision: 8c00e3b4dabaf3489af1191ad8f7b27bbfd07dd1
Parent: b6ce6b27288686bcd78dcca7b03d573906f7aee1
Author: qulogic at pidgin.im
Date: 05/26/12 15:39:31
Branch: im.pidgin.cpw.qulogic.gtk3-required
URL: http://d.pidgin.im/viewmtn/revision/info/8c00e3b4dabaf3489af1191ad8f7b27bbfd07dd1
Changelog:
There is no separator in GTK+3 dialogs anyway.
Changes against parent b6ce6b27288686bcd78dcca7b03d573906f7aee1
patched pidgin/gtkconv.c
patched pidgin/gtkdebug.c
patched pidgin/gtkdialogs.c
patched pidgin/gtklog.c
patched pidgin/gtknotify.c
patched pidgin/gtkrequest.c
-------------- next part --------------
============================================================
--- pidgin/gtkconv.c e37e797d35f6ee73381946f7ffaac54a54fd4607
+++ pidgin/gtkconv.c 5171665de4546dd6434363dedac936eef3b7027d
@@ -948,10 +948,6 @@ invite_cb(GtkWidget *widget, PidginConve
GTK_RESPONSE_OK);
gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(invite_dialog), FALSE);
- /* TODO: set no separator using GTK+ 3.0 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(invite_dialog), FALSE);
-#endif
info->window = GTK_WIDGET(invite_dialog);
@@ -8911,12 +8907,6 @@ build_warn_close_dialog(PidginWindow *gt
6);
gtk_window_set_resizable(GTK_WINDOW(warn_close_dialog), FALSE);
- /* TODO: figure out how to set no separator in GTK+ 3.0 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(warn_close_dialog),
- FALSE);
-#endif
-
/* Setup the outside spacing. */
vbox = gtk_dialog_get_content_area(GTK_DIALOG(warn_close_dialog));
============================================================
--- pidgin/gtkdebug.c d9a6c97e01798392a588dd165dd8d7515ec631ba
+++ pidgin/gtkdebug.c eeacc047074d864512380a51e91e1e3c67a5e9cc
@@ -186,9 +186,6 @@ find_cb(GtkWidget *w, DebugWindow *win)
gtk_container_set_border_width(GTK_CONTAINER(win->find), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(win->find), FALSE);
-#if !GTK_CHECK_VERSION(2,22,0)
- gtk_dialog_set_has_separator(GTK_DIALOG(win->find), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BORDER);
gtk_container_set_border_width(
GTK_CONTAINER(GTK_DIALOG(win->find)->vbox), PIDGIN_HIG_BOX_SPACE);
============================================================
--- pidgin/gtknotify.c 37c0a306e5a71846c399d772bdd83c57351be9c8
+++ pidgin/gtknotify.c e6de987a7577380d8f9cde87de0b64514f9e5121
@@ -534,11 +534,6 @@ pidgin_notify_message(PurpleNotifyMsgTyp
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BORDER);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- /* TODO: not sure if there is a way to do this in gtk+ 3, or
- if we want to... */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
@@ -1510,10 +1505,6 @@ pidgin_create_notification_dialog(Pidgin
gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BOX_SPACE);
- /* TODO: not sure if this is possible (or necessary) in gtk+ 3 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER);
============================================================
--- pidgin/gtkrequest.c fb5d0049b912241ae9dc7cf64f14409276cc22b0
+++ pidgin/gtkrequest.c 5ca452b068417913b749358aca2d3f8c5e874200
@@ -362,10 +362,6 @@ pidgin_request_input(const char *title,
PIDGIN_HIG_BORDER / 2);
if (!multiline)
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- /* TODO: not sure how to do this with GTK+ 3 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-#endif
gtk_dialog_set_default_response(GTK_DIALOG(dialog), 0);
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER);
@@ -534,10 +530,6 @@ pidgin_request_choice(const char *title,
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER / 2);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- /* TODO: don't know if this is possible with GTK+ 3 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER);
@@ -662,10 +654,6 @@ pidgin_request_action_with_icon(const ch
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER / 2);
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
- /* TODO: this is probably not supported by GTK+ 3 */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
PIDGIN_HIG_BORDER);
============================================================
--- pidgin/gtklog.c adaa89cd49ba82715cea53ab717ba6452e47c07d
+++ pidgin/gtklog.c 75dd83cce263b58f44c2775f35c22554a7a6191e
@@ -583,10 +583,6 @@ static PidginLogViewer *display_log_view
gtk_dialog_add_button(GTK_DIALOG(lv->window), _("_Browse logs folder"), GTK_RESPONSE_HELP);
#endif
gtk_container_set_border_width (GTK_CONTAINER(lv->window), PIDGIN_HIG_BOX_SPACE);
- /* TODO: is it possible to set this in GTK+ 3.0? */
-#if 0
- gtk_dialog_set_has_separator(GTK_DIALOG(lv->window), FALSE);
-#endif
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))), 0);
g_signal_connect(G_OBJECT(lv->window), "response",
G_CALLBACK(destroy_cb), ht);
============================================================
--- pidgin/gtkdialogs.c c83459672346e7f185d2d43620fd2fa77e5de3a4
+++ pidgin/gtkdialogs.c 6bbfde4f969e544496a0809c24ecd41f1ea5d940
@@ -974,8 +974,6 @@ pidgin_dialogs_ee(const char *ee)
gtk_container_set_border_width (GTK_CONTAINER(window), PIDGIN_HIG_BOX_SPACE);
gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
- /* TODO: figure out how to set no separator in a dialog in GTK+ 3.0 */
- /*gtk_dialog_set_has_separator(GTK_DIALOG(window), FALSE);*/
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
PIDGIN_HIG_BORDER);
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(window))),
More information about the Commits
mailing list