tags 515275 + patch
thank you
Hi,
Here is a patch that solves at least most of this issue. I still get a
bit of a wierd build issue but I'm not sure it is Gtk2 related. Hope it
helps.
Thanks,
Barry deFreese
diff -u gcrontab-0.8.0/debian/changelog gcrontab-0.8.0/debian/changelog
--- gcrontab-0.8.0/debian/changelog
+++ gcrontab-0.8.0/debian/changelog
@@ -1,3 +1,10 @@
+gcrontab (0.8.0-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Test build with Gtk2.
+
+ -- Barry deFreese <bdefre...@debian.org> Mon, 23 Feb 2009 22:57:07 -0500
+
gcrontab (0.8.0-4) unstable; urgency=low
* New maintainer (Closes: #465989). Ack 0.8.0-3.1 changes.
diff -u gcrontab-0.8.0/debian/control gcrontab-0.8.0/debian/control
--- gcrontab-0.8.0/debian/control
+++ gcrontab-0.8.0/debian/control
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Jari Aalto <jari.aa...@cante.net>
-Build-Depends: debhelper (>= 7), libglib1.2-dev, libgtk1.2-dev, dpatch
+Build-Depends: debhelper (>= 7), libglib2.0-dev, libgtk2.0-dev, dpatch
Standards-Version: 3.8.0
Vcs-Browser: http://git.debian.org/?p=collab-maint/gcrontab.git
Vcs-Git: git://git.debian.org/git/collab-maint/gcrontab.git
--- gcrontab-0.8.0.orig/src/interface.c
+++ gcrontab-0.8.0/src/interface.c
@@ -69,7 +69,7 @@
accel_group = gtk_accel_group_new ();
- win_citem = gtk_window_new (GTK_WINDOW_DIALOG);
+ win_citem = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_object_set_data (GTK_OBJECT (win_citem), "win_citem", win_citem);
gtk_widget_set_usize (win_citem, 600, 200);
gtk_window_set_title (GTK_WINDOW (win_citem), _("Cron item"));
@@ -538,7 +538,7 @@
gtk_object_set_data_full (GTK_OBJECT (win_main), "file_menu", file_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (file), file_menu);
- file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
+/* file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(file_menu)); */
New = gtk_menu_item_new_with_label (_("New"));
gtk_widget_ref (New);
@@ -620,7 +620,7 @@
gtk_object_set_data_full (GTK_OBJECT (win_main), "crontab1_menu",
crontab1_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (crontab1), crontab1_menu);
- crontab1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(crontab1_menu));
+/* crontab1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(crontab1_menu)); */
set_current_file1 = gtk_menu_item_new_with_label (_("Set current file"));
gtk_widget_ref (set_current_file1);
@@ -666,7 +666,7 @@
gtk_object_set_data_full (GTK_OBJECT (win_main), "options_menu",
options_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (options), options_menu);
- options_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(options_menu));
+/* options_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(options_menu)); */
simplified_mode = gtk_check_menu_item_new_with_label (_("Simplified mode"));
gtk_widget_ref (simplified_mode);
@@ -718,7 +718,7 @@
gtk_object_set_data_full (GTK_OBJECT (win_main), "help_menu", help_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (help), help_menu);
- help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_menu));
+/* help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU
(help_menu)); */
hlp = gtk_menu_item_new_with_label (_("gcrontab help"));
gtk_widget_ref (hlp);
@@ -763,15 +763,16 @@
gtk_box_pack_start (GTK_BOX (vbox3), handlebox4, FALSE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (handlebox4), 2);
- toolbar4 = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+/* toolbar4 = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_ICONS); */
+ toolbar4 = gtk_toolbar_new ();
gtk_widget_ref (toolbar4);
gtk_object_set_data_full (GTK_OBJECT (win_main), "toolbar4", toolbar4,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar4);
gtk_container_add (GTK_CONTAINER (handlebox4), toolbar4);
- gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar4), 0);
- gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar4), GTK_TOOLBAR_SPACE_LINE);
- gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar4), GTK_RELIEF_NONE);
+/* gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar4), 0); */
+/* gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar4),
GTK_TOOLBAR_SPACE_LINE); */
+/* gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar4), GTK_RELIEF_NONE); */
tmp_toolbar_icon = create_pixmap (win_main, "new.xpm");
btn_tbrnew = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar4),
@@ -934,14 +935,15 @@
gtk_box_pack_start (GTK_BOX (vbox3), handlebox5, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (handlebox5), 2);
- toolbar6 = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+/* toolbar6 = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL,
GTK_TOOLBAR_ICONS); */
+ toolbar6 = gtk_toolbar_new ();
gtk_widget_ref (toolbar6);
gtk_object_set_data_full (GTK_OBJECT (win_main), "toolbar6", toolbar6,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar6);
gtk_container_add (GTK_CONTAINER (handlebox5), toolbar6);
- gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar6), 0);
- gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar6), GTK_RELIEF_NONE);
+/* gtk_toolbar_set_space_size (GTK_TOOLBAR (toolbar6), 0); */
+/* gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar6), GTK_RELIEF_NONE); */
tmp_toolbar_icon = create_pixmap (win_main, "minute.xpm");
btn_minute = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar6),
@@ -1470,14 +1472,14 @@
gtk_widget_show (scrolledwindow2);
gtk_box_pack_start (GTK_BOX (vbox5), scrolledwindow2, TRUE, TRUE, 0);
- edt_text = gtk_text_new (NULL, NULL);
+ edt_text = gtk_text_view_new ();
gtk_widget_ref (edt_text);
gtk_object_set_data_full (GTK_OBJECT (win_edit), "edt_text", edt_text,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (edt_text);
gtk_container_add (GTK_CONTAINER (scrolledwindow2), edt_text);
gtk_widget_set_usize (edt_text, 400, 400);
- gtk_text_set_editable (GTK_TEXT (edt_text), TRUE);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (edt_text), TRUE);
hbuttonbox6 = gtk_hbutton_box_new ();
gtk_widget_ref (hbuttonbox6);
--- gcrontab-0.8.0.orig/src/Makefile.am
+++ gcrontab-0.8.0/src/Makefile.am
@@ -5,9 +5,9 @@
## Please disable it in the Anjuta project configuration
INCLUDES = \
- `gtk-config --cflags`
+ `pkg-config --cflags gtk+-2.0`
-CFLAGS =\
+AM_CFLAGS =\
-Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized
-Wparentheses -Wpointer-arith -Wmissing-prototypes\
-O1\
-g
only in patch2:
unchanged:
--- gcrontab-0.8.0.orig/src/callbacks.c
+++ gcrontab-0.8.0/src/callbacks.c
@@ -444,7 +444,7 @@
void
EditFile(char *fname, int status)
{
- GtkText *edt_text;
+ GtkTextView *edt_text;
char cmmd[255];
FILE *pf;
struct stat ssb;
@@ -458,9 +458,9 @@
win_edit=create_win_edit ();
gtk_window_set_modal((GtkWindow *)win_edit,1);
- edt_text=GTK_TEXT(gtk_object_get_data(GTK_OBJECT(win_edit),
"edt_text"));
- gtk_text_set_line_wrap (edt_text, TRUE);
- gtk_text_freeze (edt_text);
+ edt_text=GTK_TEXT_VIEW(gtk_object_get_data(GTK_OBJECT(win_edit),
"edt_text"));
+ gtk_text_view_set_wrap_mode (edt_text, GTK_WRAP_WORD_CHAR);
+/* gtk_text_freeze (edt_text); */
pf=fopen(fname,"r");
if(pf)
@@ -468,15 +468,16 @@
fgets(cmmd,254,pf);
while(!feof(pf))
{
-
gtk_text_insert(edt_text,NULL,NULL,NULL,cmmd,strlen(cmmd));
+ /*
gtk_text_insert(edt_text,NULL,NULL,NULL,cmmd,strlen(cmmd)); */
+
gtk_text_buffer_set_text(edt_text,cmmd,strlen(cmmd));
fgets(cmmd,254,pf);
}
fclose(pf);
}
- gtk_text_thaw (edt_text);
- gtk_text_set_editable (edt_text, status);
+ /* gtk_text_thaw (edt_text); */
+ gtk_text_view_set_editable (edt_text, TRUE);
gtk_widget_show(win_edit);
}
@@ -1398,7 +1399,7 @@
FILE *pf;
guint l;
gchar *txt;
- GtkText *edt_text;
+ GtkTextView *edt_text;
struct stat buf;
gtk_widget_hide(win_edit);
@@ -1407,7 +1408,8 @@
pf=fopen(FILENAME,"w");
edt_text=gtk_object_get_data(GTK_OBJECT(win_edit), "edt_text");
- l=gtk_text_get_length(edt_text);
+ /* l=gtk_text_get_length(edt_text); */
+
l=gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(edt_text)));
txt=gtk_editable_get_chars(GTK_EDITABLE(edt_text),0,l);
fwrite(txt,1,l,pf);
fclose(pf);
