Author: colossus
Date: 2006-12-21 13:06:28 +0000 (Thu, 21 Dec 2006)
New Revision: 24155
Modified:
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/interface.h
xarchiver/trunk/src/main.c
xarchiver/trunk/src/pref_dialog.c
xarchiver/trunk/src/support.c
Log:
Removed unnecessary code to set widget flags from src/pref_dialog.c.
Removed Close button on the toolbar.
Fixed a memory leak in src/support.c.
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2006-12-21 11:47:35 UTC (rev 24154)
+++ xarchiver/trunk/src/interface.c 2006-12-21 13:06:28 UTC (rev 24155)
@@ -293,15 +293,6 @@
gtk_container_add (GTK_CONTAINER (toolbar1), Open_button);
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Open_button), tooltips,
_("Open an archive"), NULL);
- tmp_image = gtk_image_new_from_stock ("gtk-close",
tmp_toolbar_icon_size);
- gtk_widget_show (tmp_image);
- Close_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Close"));
- gtk_widget_show (Close_button);
- gtk_widget_set_sensitive (Close_button,FALSE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (Close_button), FALSE);
- gtk_container_add (GTK_CONTAINER (toolbar1), Close_button);
- gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Close_button), tooltips,
_("Close the current archive"), NULL);
-
separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new ();
gtk_widget_show (separatortoolitem1);
gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem1);
@@ -439,7 +430,6 @@
g_signal_connect ((gpointer) New_button, "clicked", G_CALLBACK
(xa_new_archive), NULL);
g_signal_connect ((gpointer) Open_button, "clicked", G_CALLBACK
(xa_open_archive), NULL);
- g_signal_connect ((gpointer) Close_button, "clicked", G_CALLBACK
(xa_close_archive), NULL);
g_signal_connect ((gpointer) AddFile_button, "clicked", G_CALLBACK
(xa_add_files_archive), NULL);
g_signal_connect ((gpointer) Extract_button, "clicked", G_CALLBACK
(xa_extract_archive), NULL);
g_signal_connect ((gpointer) Exe_button, "clicked", G_CALLBACK
(xa_convert_sfx), NULL);
Modified: xarchiver/trunk/src/interface.h
===================================================================
--- xarchiver/trunk/src/interface.h 2006-12-21 11:47:35 UTC (rev 24154)
+++ xarchiver/trunk/src/interface.h 2006-12-21 13:06:28 UTC (rev 24155)
@@ -95,7 +95,6 @@
GtkWidget *pad_image;
GtkWidget *New_button;
GtkWidget *Open_button;
-GtkWidget *Close_button;
GtkWidget *separatortoolitem1;
GtkWidget *separatortoolitem2;
GtkWidget *AddFile_button;
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2006-12-21 11:47:35 UTC (rev 24154)
+++ xarchiver/trunk/src/main.c 2006-12-21 13:06:28 UTC (rev 24155)
@@ -383,7 +383,6 @@
gtk_widget_set_sensitive ( new1, New);
gtk_widget_set_sensitive ( Open_button, Open);
gtk_widget_set_sensitive ( open1, Open);
- gtk_widget_set_sensitive ( Close_button, Close);
gtk_widget_set_sensitive ( close1, Close);
gtk_widget_set_sensitive ( AddFile_button, add);
gtk_widget_set_sensitive ( addfile, add);
Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c 2006-12-21 11:47:35 UTC (rev 24154)
+++ xarchiver/trunk/src/pref_dialog.c 2006-12-21 13:06:28 UTC (rev 24155)
@@ -32,7 +32,6 @@
GtkTreeIter iter;
GList *archive_type;
GdkPixbuf *icon_pixbuf;
- GError *error = NULL;
Prefs_dialog_data *prefs_data;
prefs_data = g_new0 (Prefs_dialog_data,1);
@@ -51,16 +50,14 @@
gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 2);
scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, FALSE, FALSE, 0);
+ g_object_set (G_OBJECT (scrolledwindow1),"hscrollbar-policy",
GTK_POLICY_NEVER,"shadow-type", GTK_SHADOW_IN,"vscrollbar-policy",
GTK_POLICY_NEVER, NULL);
gtk_widget_show (scrolledwindow1);
- gtk_box_pack_start (GTK_BOX (hbox1), scrolledwindow1, TRUE, TRUE, 0);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW
(scrolledwindow1), GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW (scrolledwindow1)
, GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
prefs_data->prefs_liststore = gtk_list_store_new ( 2, GDK_TYPE_PIXBUF,
G_TYPE_STRING);
prefs_iconview =
gtk_icon_view_new_with_model(GTK_TREE_MODEL(prefs_data->prefs_liststore));
- g_object_unref (prefs_data->prefs_liststore);
- //gtk_widget_set_size_request(prefs_iconview, 110, -1);
+ gtk_widget_set_size_request(prefs_iconview, 80, -1);
gtk_icon_view_set_orientation (GTK_ICON_VIEW (prefs_iconview),
GTK_ORIENTATION_VERTICAL);
gtk_icon_view_set_columns (GTK_ICON_VIEW (prefs_iconview),1);
gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (prefs_iconview), 0);
@@ -68,28 +65,27 @@
gtk_container_add (GTK_CONTAINER (scrolledwindow1), prefs_iconview);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gdk_pixbuf_new_from_file
("./pixmaps/xarchiver-extract.png", &error);
+ icon_pixbuf = gdk_pixbuf_new_from_file
("./pixmaps/xarchiver-extract.png", NULL);
gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("Behaviour"), -1);
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gdk_pixbuf_new_from_file ("./pixmaps/xarchiver-add.png",
&error);
+ icon_pixbuf = gdk_pixbuf_new_from_file ("./pixmaps/xarchiver-add.png",
NULL);
gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("View"), -1);
g_object_unref (icon_pixbuf);
gtk_list_store_append (prefs_data->prefs_liststore, &iter);
- icon_pixbuf = gdk_pixbuf_new_from_file
("./pixmaps/xarchiver-extract.png", &error);
+ icon_pixbuf = gdk_pixbuf_new_from_file
("./pixmaps/xarchiver-extract.png", NULL);
gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf,
1, _("Advanced"), -1);
g_object_unref (icon_pixbuf);
+ g_object_unref (prefs_data->prefs_liststore);
gtk_widget_show (prefs_iconview);
prefs_data->prefs_notebook = gtk_notebook_new ();
+ g_object_set (G_OBJECT (prefs_data->prefs_notebook),"show-border",
FALSE,"show-tabs", FALSE,"enable-popup",FALSE,NULL);
gtk_widget_show (prefs_data->prefs_notebook);
gtk_box_pack_start (GTK_BOX (hbox1), prefs_data->prefs_notebook, TRUE,
TRUE, 0);
GTK_WIDGET_UNSET_FLAGS (prefs_data->prefs_notebook, GTK_CAN_FOCUS);
- gtk_notebook_popup_disable (GTK_NOTEBOOK (prefs_data->prefs_notebook));
- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (prefs_data->prefs_notebook),
FALSE);
- gtk_notebook_set_show_border (GTK_NOTEBOOK
(prefs_data->prefs_notebook), FALSE);
g_signal_connect (G_OBJECT (prefs_iconview),
"selection-changed",G_CALLBACK (xa_prefs_iconview_changed), prefs_data);
/* Behaviour page*/
Modified: xarchiver/trunk/src/support.c
===================================================================
--- xarchiver/trunk/src/support.c 2006-12-21 11:47:35 UTC (rev 24154)
+++ xarchiver/trunk/src/support.c 2006-12-21 13:06:28 UTC (rev 24155)
@@ -31,8 +31,7 @@
GtkWidget *file_image;
gchar *path;
GdkPixbuf *file_pixbuf = NULL;
- path = g_strconcat(DATADIR, "/pixmaps/xarchiver/", NULL);
- path = g_strconcat(path, filename, NULL);
+ path = g_strconcat(DATADIR, "/pixmaps/xarchiver/", filename, NULL);
file_pixbuf = gdk_pixbuf_new_from_file (path, &error);
g_free (path);
if ( file_pixbuf == NULL )
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
