Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv28850/src
Modified Files:
prefs.c ui.h
Log Message:
A clean-up patch from Ari Pollak.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- prefs.c 5 Aug 2002 08:04:39 -0000 1.231
+++ prefs.c 6 Aug 2002 03:02:18 -0000 1.232
@@ -32,6 +32,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <ctype.h>
#include <gtk/gtk.h>
#include "gtkimhtml.h"
#include "gaim.h"
@@ -89,7 +90,7 @@
GtkWidget *fontseld = NULL;
#if GTK_CHECK_VERSION(1,3,0)
-GtkTreeStore *prefs_away_store = NULL;
+GtkListStore *prefs_away_store = NULL;
#endif
static int sound_row_sel = 0;
@@ -108,7 +109,6 @@
static GtkWidget *show_color_pref(GtkWidget *, gboolean);
static void delete_prefs(GtkWidget *, void *);
void set_default_away(GtkWidget *, gpointer);
-static void set_font_option(GtkWidget *w, int option);
struct debug_window *dw = NULL;
static GtkWidget *prefs = NULL;
@@ -126,7 +126,8 @@
sound_entry = NULL;
browser_entry = NULL;
debugbutton=NULL;
- gtk_widget_destroy(sounddialog);
+ if(sounddialog)
+ gtk_widget_destroy(sounddialog);
#if GTK_CHECK_VERSION(1,3,0)
g_object_unref(G_OBJECT(prefs_away_store));
#endif
@@ -1359,7 +1360,6 @@
{
GtkTreeIter iter;
GValue val = { 0, };
- gchar *message;
gchar buffer[BUF_LONG];
char *tmp;
struct away_message *am;
@@ -1386,16 +1386,17 @@
GtkTreePath *path;
GtkTreeStore *ts = GTK_TREE_STORE(gtk_tree_view_get_model(tv));
GtkTreeSelection *sel = gtk_tree_view_get_selection(tv);
+ GtkTreeModel *model = GTK_TREE_MODEL(prefs_away_store);
GValue val = { 0, };
- if (! gtk_tree_selection_get_selected (sel, &prefs_away_store, &iter))
+ if (! gtk_tree_selection_get_selected (sel, &model, &iter))
return;
- gtk_tree_model_get_value (prefs_away_store, &iter, 1, &val);
+ gtk_tree_model_get_value (GTK_TREE_MODEL(prefs_away_store), &iter, 1, &val);
am = g_value_get_pointer (&val);
gtk_imhtml_clear(GTK_IMHTML(away_text));
rem_away_mess(NULL, am);
- gtk_list_store_remove(ts, &iter);
- path = gtk_tree_path_new_first();
+ gtk_list_store_remove(GTK_LIST_STORE(ts), &iter);
+ path = gtk_tree_path_new_first();
gtk_tree_selection_select_path(sel, path);
}
@@ -1440,8 +1441,8 @@
GtkWidget *away_message_page() {
GtkWidget *ret;
GtkWidget *frame;
- GtkWidget *vbox, *hbox, *bbox;
- GtkWidget *button, *image, *label;
+ GtkWidget *vbox, *hbox;
+ GtkWidget *button;
GtkWidget *sw;
#if GTK_CHECK_VERSION(1,3,0)
@@ -1467,6 +1468,10 @@
sw = gtk_scrolled_window_new(NULL,NULL);
away_text = gtk_imhtml_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(1,3,0)
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+ GTK_SHADOW_IN);
+#endif
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
#if GTK_CHECK_VERSION(1,3,0)
@@ -2172,13 +2177,14 @@
void apply_color_dlg(GtkWidget *w, gpointer d)
{
- gdouble color[3];
- if ((int)d == 1) {
#if GTK_CHECK_VERSION(1,3,0)
+ if ((int)d == 1) {
gtk_color_selection_get_current_color(GTK_COLOR_SELECTION
(GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel),
&fgcolor_new);
#else
+ gdouble color[3];
+ if ((int)d == 1) {
gtk_color_selection_get_color(GTK_COLOR_SELECTION
(GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), color);
@@ -2306,7 +2312,7 @@
gtk_widget_set_sensitive(browser_entry, TRUE);
else
gtk_widget_set_sensitive(browser_entry, FALSE);
- } else if (option == &sound_options_new) {
+ } else if (*option == sound_options_new) {
if (opt == OPT_SOUND_CMD)
gtk_widget_set_sensitive(sndcmd, TRUE);
else
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ui.h 5 Aug 2002 07:56:37 -0000 1.44
+++ ui.h 6 Aug 2002 03:02:18 -0000 1.45
@@ -477,6 +477,7 @@
extern void show_privacy_options();
extern void build_allow_list();
extern void build_block_list();
+extern void destroy_fontsel(GtkWidget *w, gpointer d);
/* Functions in multi.c */
extern void account_editor(GtkWidget *, GtkWidget *);
|
