Author: colossus
Date: 2008-08-05 12:28:29 +0000 (Tue, 05 Aug 2008)
New Revision: 27425
Modified:
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/window.c
xarchiver/trunk/src/window.h
Log:
Removed duplicate code in xa_sidepane_drag_motion() at interface.c.
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2008-08-05 08:51:00 UTC (rev 27424)
+++ xarchiver/trunk/src/interface.c 2008-08-05 12:28:29 UTC (rev 27425)
@@ -1434,7 +1434,6 @@
gboolean xa_sidepane_drag_motion (GtkWidget *widget,GdkDragContext
*context,gint x,gint y,guint time,gpointer user_data)
{
GtkTreeModel *model;
- GtkTreeIter iter;
GtkTreePath *path;
static GtkTreePath *lastpath;
@@ -1443,18 +1442,12 @@
if (path)
{
if ( lastpath != NULL && lastpath != path)
- {
- gtk_tree_model_get_iter
(GTK_TREE_MODEL(model),&iter,lastpath);
-
gtk_tree_store_set(GTK_TREE_STORE(model),&iter,0,"gtk-directory",-1);
g_source_remove_by_user_data(&lastpath);
- }
if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(widget),path))
g_timeout_add(1000,(GSourceFunc)
xa_sidepane_drag_motion_expand_timeout,&lastpath);
g_object_set_data(G_OBJECT(context),"current_path",path);
- gtk_tree_model_get_iter (GTK_TREE_MODEL(model),&iter,path);
- gtk_tree_store_set(GTK_TREE_STORE(model),&iter,0,"gtk-open",-1);
/* This to set the focus on the dropped row */
gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW(widget),path,GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
}
Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c 2008-08-05 08:51:00 UTC (rev 27424)
+++ xarchiver/trunk/src/window.c 2008-08-05 12:28:29 UTC (rev 27425)
@@ -2038,10 +2038,7 @@
else if (strstr(file,".png") || strstr(file,".gif") ||
strstr(file,".jpg") || strstr(file,".bmp") ||
strstr(file,".tif") || strstr(file,".tiff")||
strstr(file,".svg") || strstr(file,".png") ||
strstr(file,".tga"))
- {
- g_print ("Son qui");
program = gtk_combo_box_get_active_text
(GTK_COMBO_BOX(prefs_window->combo_prefered_viewer));
- }
else
{
xa_show_message_dialog (GTK_WINDOW
(xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("This file
type is not supported!"),_("Please install xdg-utils package."));
Modified: xarchiver/trunk/src/window.h
===================================================================
--- xarchiver/trunk/src/window.h 2008-08-05 08:51:00 UTC (rev 27424)
+++ xarchiver/trunk/src/window.h 2008-08-05 12:28:29 UTC (rev 27425)
@@ -56,7 +56,7 @@
Add_dialog_data *add_window;
GtkWidget *dialog, *scrollwin, *view_window, *_properties_win,*comment_dialog;
-void xa_show_cmd_line_output(GtkMenuItem *menuitem,gpointer data);
+void xa_show_cmd_line_output(GtkMenuItem *,gpointer );
void xa_new_archive (GtkMenuItem *, gpointer);
void xa_save_archive (GtkMenuItem *,gpointer);
void xa_open_archive (GtkMenuItem *, gpointer);
@@ -66,8 +66,8 @@
void xa_close_archive (GtkMenuItem *, gpointer);
void xa_quit_application (GtkMenuItem *, gpointer);
void xa_delete_archive (GtkMenuItem *, gpointer);
-void xa_determine_program_to_run(gchar *file);
-gboolean xa_launch_external_program(gchar *program,gchar *arg);
+void xa_determine_program_to_run(gchar *);
+gboolean xa_launch_external_program(gchar *,gchar *);
void xa_show_help (GtkMenuItem *, gpointer);
void xa_enter_password (GtkMenuItem *, gpointer);
void xa_about (GtkMenuItem *, gpointer);
@@ -83,7 +83,7 @@
void xa_cancel_archive ( GtkMenuItem * , gpointer);
void xa_add_files_archive ( GtkMenuItem *, gpointer);
void xa_show_prefs_dialog ( GtkMenuItem * , gpointer);
-gchar *xa_set_size_string (unsigned long long int file_size);
+gchar *xa_set_size_string (unsigned long long int );
void xa_row_selected (GtkTreeSelection *,XArchive *);
void xa_set_statusbar_message_for_displayed_rows(XArchive *);
void on_drag_data_received (GtkWidget *,GdkDragContext *, int x,int
y,GtkSelectionData *, unsigned int , unsigned int , gpointer );
@@ -93,7 +93,7 @@
int xa_show_message_dialog (GtkWindow *, int,int ,int , const gchar *,const
gchar *);
int xa_detect_archive_type (gchar *);
-gboolean xa_detect_archive_comment (int type,gchar *,XArchive *);
+gboolean xa_detect_archive_comment (int ,gchar *,XArchive *);
gboolean key_press_function ( GtkWidget* , GdkEventKey* ,gpointer );
gboolean treeview_select_search (GtkTreeModel *,gint ,const gchar
*,GtkTreeIter *,gpointer );
gboolean xa_check_child_for_error_on_exit(XArchive *,gint );
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
