gaim/gaim

backport this to oldstatus, it committed it to HEAD a long time ago, and no
oldstatus
2005-04-06, Tim Ringenbach
42e84fa17abe
Parents 9f527daa3e92
Children ab3f88721af7
backport this to oldstatus, it committed it to HEAD a long time ago, and no
one ever complained.

This removes the unused stuff from the font face dialog.
2 files changed, 110 insertions(+), 2 deletions(-)
  • +16 -2
    src/gtkimhtmltoolbar.c
  • +94 -0
    src/gtkimhtmltoolbar.h
    • --- a/src/gtkimhtmltoolbar.c Wed Apr 06 17:38:12 2005 -0400
    +++ b/src/gtkimhtmltoolbar.c Wed Apr 06 20:47:37 2005 -0400
    @@ -125,6 +125,18 @@
    }
    static void
    +realize_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
    +{
    + GtkFontSelection *sel;
    +
    + sel = GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->fontsel);
    + gtk_widget_hide_all(gtk_widget_get_parent(sel->size_entry));
    + gtk_widget_show_all(sel->family_list);
    + gtk_widget_show(gtk_widget_get_parent(sel->family_list));
    + gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent(sel->family_list)));
    +}
    +
    +static void
    cancel_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
    {
    destroy_toolbar_font(widget, NULL, toolbar);
    @@ -164,7 +176,7 @@
    toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font"));
    g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar);
    -
    +
    if(fontname) {
    char fonttif[128];
    g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname);
    @@ -173,7 +185,7 @@
    g_free(fontname);
    } else {
    gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog),
    - DEFAULT_FONT_FACE);
    + GTK_IMHTMLTOOLBAR_DEFAULT_FONT_FACE);
    }
    g_signal_connect(G_OBJECT(toolbar->font_dialog), "delete_event",
    @@ -182,6 +194,8 @@
    G_CALLBACK(apply_font), toolbar->font_dialog);
    g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked",
    G_CALLBACK(cancel_toolbar_font), toolbar);
    + g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
    + G_CALLBACK(realize_toolbar_font), toolbar);
    gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
    } else {
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/src/gtkimhtmltoolbar.h Wed Apr 06 20:47:37 2005 -0400
    @@ -0,0 +1,94 @@
    +/*
    + * GtkIMHtmlToolbar
    + *
    + * Gaim is the legal property of its developers, whose names are too numerous
    + * to list here. Please refer to the COPYRIGHT file distributed with this
    + * source distribution.
    + *
    + * This program is free software; you can redistribute it and/or modify
    + * under the terms of the GNU General Public License as published by
    + * the Free Software Foundation; either version 2 of the License, or
    + * (at your option) any later version.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program; if not, write to the Free Software
    + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    + *
    + */
    +#ifndef _GAIM_GTKIMHTMLTOOLBAR_H_
    +#define _GAIM_GTKIMHTMLTOOLBAR_H_
    +
    +#include <gtk/gtkvbox.h>
    +#include "gtkimhtml.h"
    +
    +#ifdef __cplusplus
    +extern "C" {
    +#endif
    +
    +#define GTK_IMHTMLTOOLBAR_DEFAULT_FONT_FACE "Helvetica 12"
    +
    +#define GTK_TYPE_IMHTMLTOOLBAR (gtk_imhtmltoolbar_get_type ())
    +#define GTK_IMHTMLTOOLBAR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbar))
    +#define GTK_IMHTMLTOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbarClass))
    +#define GTK_IS_IMHTMLTOOLBAR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_IMHTMLTOOLBAR))
    +#define GTK_IS_IMHTMLTOOLBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMHTMLTOOLBAR))
    +
    +typedef struct _GtkIMHtmlToolbar GtkIMHtmlToolbar;
    +typedef struct _GtkIMHtmlToolbarClass GtkIMHtmlToolbarClass;
    +
    +struct _GtkIMHtmlToolbar {
    + GtkVBox box;
    +
    + GtkWidget *imhtml;
    +
    + GtkTooltips *tooltips;
    +
    + GtkWidget *bold;
    + GtkWidget *italic;
    + GtkWidget *underline;
    +
    + GtkWidget *larger_size;
    + GtkWidget *normal_size;
    + GtkWidget *smaller_size;
    +
    + GtkWidget *font;
    + GtkWidget *fgcolor;
    + GtkWidget *bgcolor;
    +
    + GtkWidget *image;
    + GtkWidget *link;
    + GtkWidget *smiley;
    + GtkWidget *log;
    +
    + GtkWidget *font_dialog;
    + GtkWidget *fgcolor_dialog;
    + GtkWidget *bgcolor_dialog;
    + GtkWidget *link_dialog;
    + GtkWidget *smiley_dialog;
    + GtkWidget *image_dialog;
    +
    + char *sml;
    +};
    +
    +struct _GtkIMHtmlToolbarClass {
    + GtkVBoxClass parent_class;
    +
    +};
    +
    +GType gtk_imhtmltoolbar_get_type (void);
    +GtkWidget* gtk_imhtmltoolbar_new (void);
    +
    +void gtk_imhtmltoolbar_attach (GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml);
    +void gtk_imhtmltoolbar_associate_smileys (GtkIMHtmlToolbar *toolbar, const char *proto_id);
    +
    +
    +#ifdef __cplusplus
    +}
    +#endif
    +
    +#endif /* _GAIM_GTKIMHTMLTOOLBAR_H_ */