item = gtk_menu_item_new_with_label(tname->name);
gtk_widget_show(item);
- gtk_signal_connect(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(prefs_themes_menu_item_activated_cb),
- tname->item->data);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(prefs_themes_menu_item_activated_cb),
+ tname->item->data);
gtk_menu_append(GTK_MENU(menu), item);
if (tdata->displayed != NULL && tdata->displayed == tpath)
void prefs_themes_init(void)
{
- ThemesData *tdata;
- ThemesPage *page;
- GList *tpaths;
+ ThemesData *tdata;
+ ThemesPage *page;
+ GList *tpaths;
+ static gchar *path[3];
+
+ path[0] = _("Display");
+ path[1] = _("Themes");
+ path[2] = NULL;
debug_print("Creating prefereces for themes...\n");
page = g_new0(ThemesPage, 1);
- page->page.path = _("Display/Themes");
+ page->page.path = path;
page->page.create_widget = prefs_themes_create_widget;
page->page.destroy_widget = prefs_themes_destroy_widget;
page->page.save_page = prefs_themes_save;
void prefs_themes_done(void)
{
ThemesData *tdata = prefs_themes_data;
- GList *n;
debug_print("Finished prefereces for themes.\n");
static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data)
{
- struct stat s;
gchar *filename, *source;
gchar *themeinfo, *themename;
gchar *alert_title = NULL;
AlertValue val = 0;
ThemesData *tdata = prefs_themes_data;
- filename = filesel_select_file(_("Select theme folder"), NULL);
+ filename = filesel_select_file_open_folder(_("Select theme folder"), NULL);
if (filename == NULL)
return;
cinfo = g_new0(CopyInfo, 1);
- source = g_dirname(filename);
+ source = g_path_get_dirname(filename);
themename = g_basename(source);
debug_print("Installing '%s' theme from %s\n", themename, filename);
for (i = 0; i < PREVIEW_ICONS; ++i) {
stock_pixmap_gdk(theme->window, prefs_themes_icons[i],
&(theme->pixmaps[i]), &(theme->masks[i]));
- gtk_pixmap_set(GTK_PIXMAP(theme->icons[i]),
+ gtk_image_set_from_pixmap(GTK_IMAGE(theme->icons[i]),
theme->pixmaps[i], theme->masks[i]);
}
prefs_common.pixmap_theme_path = save_prefs_path;
NULL, dummy_pixmap_xpm);
if (gdkpixmap == NULL)
g_error ("Couldn't create replacement pixmap.");
- pixmap = gtk_pixmap_new (gdkpixmap, mask);
- gdk_pixmap_unref (gdkpixmap);
- gdk_bitmap_unref (mask);
+ pixmap = gtk_image_new_from_pixmap(gdkpixmap, mask);
+ g_object_unref (gdkpixmap);
+ g_object_unref (mask);
return pixmap;
}
/* END GLADE CODE */
gtk_container_add (GTK_CONTAINER (hbuttonbox1), btn_remove);
GTK_WIDGET_SET_FLAGS (btn_remove, GTK_CAN_DEFAULT);
- gtk_signal_connect(GTK_OBJECT (btn_use), "clicked",
- GTK_SIGNAL_FUNC (prefs_themes_btn_use_clicked_cb),
- NULL);
- gtk_signal_connect(GTK_OBJECT(btn_remove), "clicked",
- GTK_SIGNAL_FUNC(prefs_themes_btn_remove_clicked_cb),
- NULL);
- gtk_signal_connect(GTK_OBJECT(btn_install), "clicked",
- GTK_SIGNAL_FUNC(prefs_themes_btn_install_clicked_cb),
- NULL);
- gtk_signal_connect(GTK_OBJECT(btn_more), "clicked",
- GTK_SIGNAL_FUNC(prefs_themes_btn_more_clicked_cb),
- NULL);
+ g_signal_connect(G_OBJECT(btn_use), "clicked",
+ G_CALLBACK(prefs_themes_btn_use_clicked_cb),
+ NULL);
+ g_signal_connect(G_OBJECT(btn_remove), "clicked",
+ G_CALLBACK(prefs_themes_btn_remove_clicked_cb),
+ NULL);
+ g_signal_connect(G_OBJECT(btn_install), "clicked",
+ G_CALLBACK(prefs_themes_btn_install_clicked_cb),
+ NULL);
+ g_signal_connect(G_OBJECT(btn_more), "clicked",
+ G_CALLBACK(prefs_themes_btn_more_clicked_cb),
+ NULL);
gtk_widget_grab_default (btn_use);
/* END GLADE EDITED CODE */