--- a/pidgin/minidialog.c Wed Dec 16 00:35:23 2015 -0800
+++ b/pidgin/minidialog.c Sun Dec 20 20:46:34 2015 -0800
@@ -446,38 +446,10 @@
g_object_class_install_properties(object_class, LAST_PROPERTY, properties);
}
-#if !GTK_CHECK_VERSION(3,0,0)
-/* 16 is the width of the icon, due to PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL */
-#define BLIST_WIDTH_OTHER_THAN_LABEL \
- ((PIDGIN_HIG_BOX_SPACE * 3) + 16)
-
-#define BLIST_WIDTH_PREF \
- (PIDGIN_PREFS_ROOT "/blist/width")
-
-static void
-blist_width_changed_cb(const char *name,
- PurplePrefType type,
- gconstpointer val,
- gpointer data)
-{
- PidginMiniDialog *self = PIDGIN_MINI_DIALOG(data);
- PidginMiniDialogPrivate *priv = PIDGIN_MINI_DIALOG_GET_PRIVATE(self);
- guint blist_width = GPOINTER_TO_INT(val);
- guint label_width = blist_width - BLIST_WIDTH_OTHER_THAN_LABEL;
-
- gtk_widget_set_size_request(GTK_WIDGET(priv->title), label_width, -1);
- gtk_widget_set_size_request(GTK_WIDGET(priv->desc), label_width, -1);
-}
-#endif
-
static void
pidgin_mini_dialog_init(PidginMiniDialog *self)
{
GtkBox *self_box = GTK_BOX(self);
-#if !GTK_CHECK_VERSION(3,0,0)
- guint blist_width = purple_prefs_get_int(BLIST_WIDTH_PREF);
- guint label_width = blist_width - BLIST_WIDTH_OTHER_THAN_LABEL;
-#endif
PidginMiniDialogPrivate *priv = g_new0(PidginMiniDialogPrivate, 1);
self->priv = priv;
@@ -490,9 +462,6 @@
gtk_misc_set_alignment(GTK_MISC(priv->icon), 0, 0);
priv->title = GTK_LABEL(gtk_label_new(NULL));
-#if !GTK_CHECK_VERSION(3,0,0)
- gtk_widget_set_size_request(GTK_WIDGET(priv->title), label_width, -1);
-#endif
gtk_label_set_line_wrap(priv->title, TRUE);
gtk_label_set_selectable(priv->title, TRUE);
gtk_misc_set_alignment(GTK_MISC(priv->title), 0, 0);
@@ -501,9 +470,6 @@
gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->title), TRUE, TRUE, 0);
priv->desc = GTK_LABEL(gtk_label_new(NULL));
-#if !GTK_CHECK_VERSION(3,0,0)
- gtk_widget_set_size_request(GTK_WIDGET(priv->desc), label_width, -1);
-#endif
gtk_label_set_line_wrap(priv->desc, TRUE);
gtk_misc_set_alignment(GTK_MISC(priv->desc), 0, 0);
gtk_label_set_selectable(priv->desc, TRUE);
@@ -512,11 +478,6 @@
*/
g_object_set(G_OBJECT(priv->desc), "no-show-all", TRUE, NULL);
-#if !GTK_CHECK_VERSION(3,0,0)
- purple_prefs_connect_callback(self, BLIST_WIDTH_PREF,
- blist_width_changed_cb, self);
-#endif
-
self->contents = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
priv->buttons = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));