applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate compiler warnings

Browse source 
2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-dir-view-list.c: Eliminate compiler warnings

	* preferences.c: Eliminate compiler warnings

	* capplet-dir-view.c: Eliminate compiler warnings

	* capplet-dir.c: Eliminate compiler warnings

	* main.c: Eliminate compiler warnings
This commit is contained in:
Bradford Hovinen 2001-12-20 20:32:02 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 1afc14e0c4
commit 894a0a1c3a
7 changed files with 44 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
control-center/ChangeLog
View file

@ -1,3 +1,15 @@
2001-12-20 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir-view-list.c: Eliminate compiler warnings
* preferences.c: Eliminate compiler warnings
* capplet-dir-view.c: Eliminate compiler warnings
* capplet-dir.c: Eliminate compiler warnings
* main.c: Eliminate compiler warnings
2001-12-19 Seth Nickell <snickell@stanford.edu> 2001-12-19 Seth Nickell <snickell@stanford.edu>
* Makefile.am: * Makefile.am:

19
control-center/capplet-dir-view-list.c
View file

@ -82,6 +82,8 @@ list_clean (CappletDirView *view)
g_free (data); g_free (data);
} }
#if 0
/* /*
* Creates a 24-bits RGB value from a GdkColor * Creates a 24-bits RGB value from a GdkColor
*/ */
@ -134,6 +136,8 @@ flatten_alpha (GdkPixbuf *image, GnomeCanvas *canvas)
return item; return item;
} }
#endif
static gpointer static gpointer
real_slist_nth_data (GSList *list, guint n, guint type) real_slist_nth_data (GSList *list, guint n, guint type)
{ {
@ -147,6 +151,8 @@ real_slist_nth_data (GSList *list, guint n, guint type)
return list->data; return list->data;
i++; i++;
} }
return NULL;
} }
static void static void
@ -171,7 +177,7 @@ sidebar_select_cb (GtkTreeSelection *sel, CappletDirView *view)
if (data->ignore_selection) if (data->ignore_selection)
return; return;
gtk_tree_selection_selected_foreach (sel, sidebar_dummy_foreach, &dir); gtk_tree_selection_selected_foreach (sel, (GtkTreeSelectionForeachFunc) sidebar_dummy_foreach, &dir);
data->current = dir; data->current = dir;
capplet_dir_entry_activate (CAPPLET_DIR_ENTRY (dir), view); capplet_dir_entry_activate (CAPPLET_DIR_ENTRY (dir), view);
} }
@ -275,8 +281,6 @@ list_populate (CappletDirView *view)
{ {
GSList *list; GSList *list;
int i; int i;
GnomeCanvasItem *item;
GtkTreeIter iter;
ListViewData *data = view->view_data; ListViewData *data = view->view_data;
g_return_if_fail (GNOME_IS_ICON_LIST (data->gil)); g_return_if_fail (GNOME_IS_ICON_LIST (data->gil));
@ -427,10 +431,8 @@ list_create (CappletDirView *view)
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GtkWidget *w, *sw, *vbox, *hbox; GtkWidget *w, *sw, *vbox, *hbox;
GtkWidget *darea; GtkWidget *darea;
GSList *list;
ListViewData *data; ListViewData *data;
gchar *title; gchar *title;
int i;
GtkCellRenderer *renderer; GtkCellRenderer *renderer;
GtkTreeSelection *sel; GtkTreeSelection *sel;
@ -440,7 +442,7 @@ list_create (CappletDirView *view)
darea = data->header = gtk_drawing_area_new (); darea = data->header = gtk_drawing_area_new ();
gtk_widget_set_usize (darea, 48, 48); gtk_widget_set_usize (darea, 48, 48);
gtk_signal_connect (GTK_OBJECT (darea), "expose_event", gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
header_expose_cb, view); (GCallback) header_expose_cb, view);
gtk_box_pack_start (GTK_BOX (vbox), darea, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), darea, FALSE, FALSE, 0);
@ -464,7 +466,7 @@ list_create (CappletDirView *view)
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (w)); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (w));
gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (sel), "changed", sidebar_select_cb, view); g_signal_connect (G_OBJECT (sel), "changed", (GCallback) sidebar_select_cb, view);
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_usize (sw, 200, -1); gtk_widget_set_usize (sw, 200, -1);
@ -481,7 +483,8 @@ list_create (CappletDirView *view)
adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)); adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
data->gil = w = gnome_icon_list_new (72, NULL, 0); w = gnome_icon_list_new (72, NULL, 0);
data->gil = GNOME_ICON_LIST (w);
title = g_concat_dir_and_file (ART_DIR, "title.png"); title = g_concat_dir_and_file (ART_DIR, "title.png");
data->header_logo = gdk_pixbuf_new_from_file (title, NULL); data->header_logo = gdk_pixbuf_new_from_file (title, NULL);

2
control-center/capplet-dir-view-tree.c
View file

@ -64,7 +64,6 @@ populate_tree_branch (CappletDir *dir, GtkCTree *ctree, GtkCTreeNode *parent)
gdk_pixbuf_unref (pixbuf); gdk_pixbuf_unref (pixbuf);
gdk_pixbuf_unref (scaled); gdk_pixbuf_unref (scaled);
#warning Should an array be created instead of passing &entry->label ?
current = gtk_ctree_insert_node current = gtk_ctree_insert_node
(ctree, parent, NULL, (ctree, parent, NULL,
&entry->label, 10, &entry->label, 10,
@ -121,7 +120,6 @@ tree_event_cb (GtkCTree *ctree, GdkEventButton *event,
static GtkWidget * static GtkWidget *
tree_create (CappletDirView *view) tree_create (CappletDirView *view)
{ {
GtkAdjustment *adjustment;
GtkWidget *w, *sw; GtkWidget *w, *sw;
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);

33
control-center/capplet-dir-view.c
View file

@ -56,7 +56,6 @@ static gboolean authed;
static void capplet_dir_view_init (CappletDirView *capplet_dir_view, static void capplet_dir_view_init (CappletDirView *capplet_dir_view,
CappletDirViewClass *class); CappletDirViewClass *class);
static void capplet_dir_view_class_init (CappletDirViewClass *class); static void capplet_dir_view_class_init (CappletDirViewClass *class);
static void capplet_dir_view_base_init (CappletDirViewClass *class);
static void capplet_dir_view_set_prop (GObject *object, static void capplet_dir_view_set_prop (GObject *object,
guint prop_id, guint prop_id,
@ -158,11 +157,6 @@ capplet_dir_view_class_init (CappletDirViewClass *klass)
parent_class = G_OBJECT_CLASS (g_type_class_ref (G_TYPE_OBJECT)); parent_class = G_OBJECT_CLASS (g_type_class_ref (G_TYPE_OBJECT));
} }
static void
capplet_dir_view_base_init (CappletDirViewClass *klass)
{
}
static void static void
capplet_dir_view_set_prop (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) capplet_dir_view_set_prop (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{ {
@ -284,12 +278,6 @@ capplet_dir_views_set_authenticated (gboolean amiauthedornot)
g_list_foreach (window_list, (GFunc)capplet_dir_view_update_authenticated, NULL); g_list_foreach (window_list, (GFunc)capplet_dir_view_update_authenticated, NULL);
} }
static void
print_somthing (GtkObject *o, char *s)
{
g_print ("somthing destroyed: %s\n", s);
}
static void static void
close_cb (GtkWidget *widget, CappletDirView *view) close_cb (GtkWidget *widget, CappletDirView *view)
{ {
@ -331,6 +319,8 @@ about_menu_cb (GtkWidget *widget, CappletDirView *view)
gtk_widget_show (about); gtk_widget_show (about);
} }
#if 0
static void static void
menu_cb (GtkWidget *w, CappletDirView *view, CappletDirViewLayout layout) menu_cb (GtkWidget *w, CappletDirView *view, CappletDirViewLayout layout)
{ {
@ -340,6 +330,8 @@ menu_cb (GtkWidget *w, CappletDirView *view, CappletDirViewLayout layout)
gtk_object_set (GTK_OBJECT (view), "layout", layout, NULL); gtk_object_set (GTK_OBJECT (view), "layout", layout, NULL);
} }
#endif
#ifdef USE_HTML #ifdef USE_HTML
static void static void
html_menu_cb (GtkWidget *w, CappletDirView *view) html_menu_cb (GtkWidget *w, CappletDirView *view)
@ -348,6 +340,8 @@ html_menu_cb (GtkWidget *w, CappletDirView *view)
} }
#endif #endif
#if 0
static void static void
icon_menu_cb (GtkWidget *w, CappletDirView *view) icon_menu_cb (GtkWidget *w, CappletDirView *view)
{ {
@ -369,6 +363,8 @@ button_cb (GtkWidget *w, CappletDirView *view, CappletDirViewLayout layout)
gtk_object_set (GTK_OBJECT (view), "layout", layout, NULL); gtk_object_set (GTK_OBJECT (view), "layout", layout, NULL);
} }
#endif
#ifdef USE_HTML #ifdef USE_HTML
static void static void
html_toggle_cb (GtkWidget *w, CappletDirView *view) html_toggle_cb (GtkWidget *w, CappletDirView *view)
@ -377,6 +373,8 @@ html_toggle_cb (GtkWidget *w, CappletDirView *view)
} }
#endif #endif
#if 0
static void static void
list_toggle_cb (GtkWidget *w, CappletDirView *view) list_toggle_cb (GtkWidget *w, CappletDirView *view)
{ {
@ -409,6 +407,8 @@ rootm_button_cb (GtkWidget *w, CappletDirView *view)
gdk_beep (); gdk_beep ();
} }
#endif
static void static void
option_menu_activate (GtkWidget *w, CappletDirEntry *entry) option_menu_activate (GtkWidget *w, CappletDirEntry *entry)
{ {
@ -425,9 +425,6 @@ void
capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir) capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
{ {
GtkWidget *menu, *menuitem, *w, *hbox; GtkWidget *menu, *menuitem, *w, *hbox;
GdkPixbuf *pb, *scaled;
GdkPixmap *pixmap;
GdkBitmap *bitmap;
CappletDirEntry *entry; CappletDirEntry *entry;
int parents = 0; int parents = 0;
gchar *title; gchar *title;
@ -477,13 +474,11 @@ capplet_dir_view_load_dir (CappletDirView *view, CappletDir *dir)
gtk_widget_show_all (menu); gtk_widget_show_all (menu);
} }
#if 0
static void static void
help_cb (GtkWidget *widget, CappletDirView *view) help_cb (GtkWidget *widget, CappletDirView *view)
{ {
gchar *tmp;
if (!gnome_help_display ("users-guide", "gcc.html", if (!gnome_help_display ("users-guide", "gcc.html",
NULL)) NULL))
{ {
@ -499,6 +494,7 @@ help_cb (GtkWidget *widget, CappletDirView *view)
} }
} }
#endif
#if 0 #if 0
static void static void
@ -518,7 +514,6 @@ static void
prefs_changed_cb (GnomeCCPreferences *prefs) prefs_changed_cb (GnomeCCPreferences *prefs)
{ {
GList *node; GList *node;
CappletDirView *view;
for (node = window_list; node; node = node->next) for (node = window_list; node; node = node->next)
gtk_object_set (GTK_OBJECT (node->data), "layout", prefs->layout, NULL); gtk_object_set (GTK_OBJECT (node->data), "layout", prefs->layout, NULL);

19
control-center/capplet-dir.c
View file

@ -250,22 +250,13 @@ capplet_activate (Capplet *capplet)
entry = CAPPLET_DIR_ENTRY (capplet); entry = CAPPLET_DIR_ENTRY (capplet);
#warning FIXME: this should probably be root-manager-helper if (capplet->launching) {
#if 0 return;
if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager"))) {
start_capplet_through_root_manager (entry->entry);
} else { } else {
#endif capplet->launching = TRUE;
if (capplet->launching) { gtk_timeout_add (1000, (GtkFunction) capplet_reset_cb, capplet);
return; gnome_desktop_item_launch (entry->entry, NULL, 0, NULL);
} else {
capplet->launching = TRUE;
gtk_timeout_add (1000, (GtkFunction) capplet_reset_cb, capplet);
gnome_desktop_item_launch (entry->entry, NULL, 0, NULL);
}
#if 0
} }
#endif
} }
void void

4
control-center/main.c
View file

@ -36,13 +36,9 @@
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
CORBA_ORB orb;
CappletDirEntry *entry; CappletDirEntry *entry;
CappletDir *dir; CappletDir *dir;
static gchar *capplet = NULL;
bindtextdomain (PACKAGE, GNOMELOCALEDIR); bindtextdomain (PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (PACKAGE, "UTF-8"); bind_textdomain_codeset (PACKAGE, "UTF-8");
textdomain (PACKAGE); textdomain (PACKAGE);

7
control-center/preferences.c
View file

@ -136,8 +136,6 @@ gnomecc_preferences_copy (GnomeCCPreferences *new, GnomeCCPreferences *old)
void void
gnomecc_preferences_load (GnomeCCPreferences *prefs) gnomecc_preferences_load (GnomeCCPreferences *prefs)
{ {
GConfEngine *engine;
g_return_if_fail (prefs != NULL); g_return_if_fail (prefs != NULL);
#if 0 #if 0
@ -267,8 +265,9 @@ prefs_dialog_cancel_cb (GtkWidget *widget, GladeXML *data)
static void static void
set_single_window_controls_sensitive (GladeXML *data, gboolean s) set_single_window_controls_sensitive (GladeXML *data, gboolean s)
{ {
GtkWidget *widget;
#if 0 #if 0
GtkWidget *widget;
widget = glade_xml_get_widget (prefs_dialog_data, "single_widget"); widget = glade_xml_get_widget (prefs_dialog_data, "single_widget");
gtk_widget_set_sensitive (widget, s); gtk_widget_set_sensitive (widget, s);
widget = glade_xml_get_widget (prefs_dialog_data, "multiple_widget"); widget = glade_xml_get_widget (prefs_dialog_data, "multiple_widget");
@ -287,8 +286,6 @@ tree_widget_toggled_cb (GtkWidget *widget)
GtkWidget * GtkWidget *
gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs) gnomecc_preferences_get_config_dialog (GnomeCCPreferences *prefs)
{ {
GtkWidget *widget;
if (prefs_dialog_data) return prefs_dialog; if (prefs_dialog_data) return prefs_dialog;
old_prefs = gnomecc_preferences_clone (prefs); old_prefs = gnomecc_preferences_clone (prefs);