file-roller r2247 - in trunk: . src
- From: paobac svn gnome org
- To: svn-commits-list gnome org
- Subject: file-roller r2247 - in trunk: . src
- Date: Tue, 15 Apr 2008 12:21:55 +0100 (BST)
Author: paobac
Date: Tue Apr 15 12:21:55 2008
New Revision: 2247
URL: http://svn.gnome.org/viewvc/file-roller?rev=2247&view=rev
Log:
2008-04-15 Paolo Bacchilega <paobac svn gnome org>
* src/fr-marshal.list: added VOID:INT,INT used in sexy-icon-entry.c
* src/sexy-icon-entry.c (sexy_icon_entry_class_init):
use fr_marshal_VOID__INT_INT instead of gtk_marshal_VOID__INT_INT
* src/fr-window.c (fr_window_start_activity_mode):
use g_timeout_add instead of the deprecated gtk_timeout_add.
* src/dlg-update.c (update_file_list):
use gtk_label_set_text instead of the deprecated gtk_label_set.
Modified:
trunk/ChangeLog
trunk/src/dlg-update.c
trunk/src/fr-marshal.list
trunk/src/fr-window.c
trunk/src/sexy-icon-entry.c
Modified: trunk/src/dlg-update.c
==============================================================================
--- trunk/src/dlg-update.c (original)
+++ trunk/src/dlg-update.c Tue Apr 15 12:21:55 2008
@@ -181,7 +181,7 @@
"There are %d files that have been modified with an external application. If you don't update the files in the archive, all of your changes will be lost.",
n_files),
n_files);
- gtk_label_set (GTK_LABEL (data->update_files_secondary_text_label), label);
+ gtk_label_set_text (GTK_LABEL (data->update_files_secondary_text_label), label);
g_free (label);
}
Modified: trunk/src/fr-marshal.list
==============================================================================
--- trunk/src/fr-marshal.list (original)
+++ trunk/src/fr-marshal.list Tue Apr 15 12:21:55 2008
@@ -1,4 +1,5 @@
VOID:INT
+VOID:INT,INT
VOID:INT,POINTER
VOID:POINTER
VOID:VOID
Modified: trunk/src/fr-window.c
==============================================================================
--- trunk/src/fr-window.c (original)
+++ trunk/src/fr-window.c Tue Apr 15 12:21:55 2008
@@ -6452,9 +6452,9 @@
if (window->priv->activity_ref++ > 0)
return;
- window->priv->activity_timeout_handle = gtk_timeout_add (ACTIVITY_DELAY,
- activity_cb,
- window);
+ window->priv->activity_timeout_handle = g_timeout_add (ACTIVITY_DELAY,
+ activity_cb,
+ window);
fr_window_update_sensitivity (window);
}
@@ -6470,7 +6470,7 @@
if (window->priv->activity_timeout_handle == 0)
return;
- gtk_timeout_remove (window->priv->activity_timeout_handle);
+ g_source_remove (window->priv->activity_timeout_handle);
window->priv->activity_timeout_handle = 0;
if (window->priv->progress_dialog != NULL)
Modified: trunk/src/sexy-icon-entry.c
==============================================================================
--- trunk/src/sexy-icon-entry.c (original)
+++ trunk/src/sexy-icon-entry.c Tue Apr 15 12:21:55 2008
@@ -15,7 +15,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
*/
@@ -45,6 +46,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include "sexy-icon-entry.h"
+#include "fr-marshal.h"
#define ICON_MARGIN 2
#define MAX_ICONS 2
@@ -156,7 +158,7 @@
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(SexyIconEntryClass, icon_pressed),
NULL, NULL,
- gtk_marshal_VOID__INT_INT,
+ fr_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
@@ -176,7 +178,7 @@
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET(SexyIconEntryClass, icon_released),
NULL, NULL,
- gtk_marshal_VOID__INT_INT,
+ fr_marshal_VOID__INT_INT,
G_TYPE_NONE, 2,
G_TYPE_INT,
G_TYPE_INT);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]